wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

OCSP Stapling/No Server Build

Browse Source 
In the case of OCSP Stapling being enabled and NO_WOLFSSL_SERVER being
set, there was a spot where the ocsp_stapling list was still being
touched even though it is left out of the build. Just needed to add the
right #ifdefs.
This commit is contained in:
John Safranek
2018-09-06 16:56:09 -07:00
parent 8e67ef33b2
commit 15be0aceed
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ssl.c
View File

@ -3016,8 +3016,9 @@ void wolfSSL_CertManagerFree(WOLFSSL_CERT_MANAGER* cm)
if (cm->ocsp) if (cm->ocsp)
FreeOCSP(cm->ocsp, 1); FreeOCSP(cm->ocsp, 1);
XFREE(cm->ocspOverrideURL, cm->heap, DYNAMIC_TYPE_URL); XFREE(cm->ocspOverrideURL, cm->heap, DYNAMIC_TYPE_URL);
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \ #if !defined(NO_WOLFSSL_SERVER) && \
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) (defined(HAVE_CERTIFICATE_STATUS_REQUEST) || \
defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2))
if (cm->ocsp_stapling) if (cm->ocsp_stapling)
FreeOCSP(cm->ocsp_stapling, 1); FreeOCSP(cm->ocsp_stapling, 1);
#endif #endif
@ -5404,6 +5405,7 @@ int wolfSSL_CertManagerEnableOCSPStapling(WOLFSSL_CERT_MANAGER* cm)
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \ #if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
#ifndef NO_WOLFSSL_SERVER
if (cm->ocsp_stapling == NULL) { if (cm->ocsp_stapling == NULL) {
cm->ocsp_stapling = (WOLFSSL_OCSP*)XMALLOC(sizeof(WOLFSSL_OCSP), cm->ocsp_stapling = (WOLFSSL_OCSP*)XMALLOC(sizeof(WOLFSSL_OCSP),
cm->heap, DYNAMIC_TYPE_OCSP); cm->heap, DYNAMIC_TYPE_OCSP);
@ -5417,13 +5419,14 @@ int wolfSSL_CertManagerEnableOCSPStapling(WOLFSSL_CERT_MANAGER* cm)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
cm->ocspStaplingEnabled = 1;
#ifndef WOLFSSL_USER_IO #ifndef WOLFSSL_USER_IO
cm->ocspIOCb = EmbedOcspLookup; cm->ocspIOCb = EmbedOcspLookup;
cm->ocspRespFreeCb = EmbedOcspRespFree; cm->ocspRespFreeCb = EmbedOcspRespFree;
cm->ocspIOCtx = cm->heap; cm->ocspIOCtx = cm->heap;
#endif /* WOLFSSL_USER_IO */ #endif /* WOLFSSL_USER_IO */
#endif /* NO_WOLFSSL_SERVER */
cm->ocspStaplingEnabled = 1;
#else #else
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif #endif