GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-08-08 09:21:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmp-uninitialised-handle' into 'master'

Browse Source 
Do not use uninitialised PAM/GnuTLS handles

Closes #722

See merge request openconnect/ocserv!547
This commit is contained in:
Nikos Mavrogiannopoulos
2026-05-17 19:56:55 +00:00
parent 6e658f00ae d019cd1c84
commit 0b47ea457d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/acct/pam.c
+1 -1
View File
@@ -62,7 +62,7 @@ static int pam_acct_open_session(void *vctx, unsigned int auth_method,
pret = pam_start(PACKAGE, ai->username, &dc, &ph);
if (pret != PAM_SUCCESS) {
oc_syslog(LOG_NOTICE, "PAM-acct init: %s",
pam_strerror(ph, pret));
pam_strerror(NULL, pret));
goto fail1;
}
src/worker-http-handlers.c
+8 -7
View File
@@ -160,13 +160,6 @@ static int ca_handler(worker_st *ws, unsigned int http_ver, unsigned int der)
return -1;
}
ret = gnutls_x509_crt_init(&issuer);
if (ret < 0) {
oclog(ws, LOG_DEBUG, "could not initialize cert");
ret = -1;
goto cleanup;
}
ret = gnutls_x509_crt_import(crt, &certs[0],
GNUTLS_X509_FMT_DER);
if (ret < 0) {
@@ -182,6 +175,14 @@ static int ca_handler(worker_st *ws, unsigned int http_ver, unsigned int der)
goto cleanup;
}
ret = gnutls_x509_crt_init(&issuer);
if (ret < 0) {
ret = -1;
oclog(ws, LOG_DEBUG,
"could not initialize issuer cert");
goto cleanup;
}
ret = gnutls_x509_crt_import(issuer, &tmpca,
GNUTLS_X509_FMT_DER);
if (ret < 0) {