feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

ocsp: enable OPENSSL tlsext status cb for NGINX and HAPROXY

Browse Source
This commit is contained in:
Marco Oliverio
2025-02-17 14:53:49 +00:00
parent a1d1f0ddf1
commit 7db3c34e2b
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal.c
View File

@@ -8690,13 +8690,13 @@ void wolfSSL_ResourceFree(WOLFSSL* ssl)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
XFREE(ssl->param, ssl->heap, DYNAMIC_TYPE_OPENSSL); XFREE(ssl->param, ssl->heap, DYNAMIC_TYPE_OPENSSL);
#endif #endif
#if defined(HAVE_OCSP) && defined(OPENSSL_ALL) #if defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY))
if (ssl->ocspResp) { if (ssl->ocspResp) {
XFREE(ssl->ocspResp, NULL, 0); XFREE(ssl->ocspResp, NULL, 0);
ssl->ocspResp = NULL; ssl->ocspResp = NULL;
ssl->ocspRespSz = 0; ssl->ocspRespSz = 0;
} }
#endif /* defined(HAVE_OCSP) && defined(OPENSSL_ALL) */ #endif /* defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)) */
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH) #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH)
while (ssl->certReqCtx != NULL) { while (ssl->certReqCtx != NULL) {
CertReqCtx* curr = ssl->certReqCtx; CertReqCtx* curr = ssl->certReqCtx;
@@ -9021,13 +9021,13 @@ void FreeHandshakeResources(WOLFSSL* ssl)
* !WOLFSSL_POST_HANDSHAKE_AUTH */ * !WOLFSSL_POST_HANDSHAKE_AUTH */
#endif /* HAVE_TLS_EXTENSIONS && !NO_TLS */ #endif /* HAVE_TLS_EXTENSIONS && !NO_TLS */
#if defined(HAVE_OCSP) && defined(OPENSSL_ALL) #if defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY))
if (ssl->ocspResp != NULL) { if (ssl->ocspResp != NULL) {
XFREE(ssl->ocspResp, NULL, 0); XFREE(ssl->ocspResp, NULL, 0);
ssl->ocspResp = NULL; ssl->ocspResp = NULL;
ssl->ocspRespSz = 0; ssl->ocspRespSz = 0;
} }
#endif /* HAVE_OCSP && OPENSSL_ALL */ #endif /* defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)) */
#ifdef WOLFSSL_STATIC_MEMORY #ifdef WOLFSSL_STATIC_MEMORY
/* when done with handshake decrement current handshake count */ /* when done with handshake decrement current handshake count */

4
src/ssl.c
View File

@@ -17355,7 +17355,7 @@ void wolfSSL_ERR_load_SSL_strings(void)
} }
#endif #endif
#ifdef HAVE_OCSP #if defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY))
long wolfSSL_get_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char **resp) long wolfSSL_get_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char **resp)
{ {
if (s == NULL || resp == NULL) if (s == NULL || resp == NULL)
@@ -17377,7 +17377,7 @@ long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *resp,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* HAVE_OCSP */ #endif /* defined(HAVE_OCSP) && (defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)) */
#ifdef HAVE_MAX_FRAGMENT #ifdef HAVE_MAX_FRAGMENT
#if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS) #if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS)

4
wolfssl/internal.h
View File

@@ -6133,13 +6133,11 @@ struct WOLFSSL {
void* ocspIOCtx; void* ocspIOCtx;
byte ocspProducedDate[MAX_DATE_SZ]; byte ocspProducedDate[MAX_DATE_SZ];
int ocspProducedDateFormat; int ocspProducedDateFormat;
#ifdef OPENSSL_EXTRA #if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)
byte* ocspResp; byte* ocspResp;
int ocspRespSz; int ocspRespSz;
#if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)
char* url; char* url;
#endif #endif
#endif
#if defined(WOLFSSL_TLS13) && defined(HAVE_CERTIFICATE_STATUS_REQUEST) #if defined(WOLFSSL_TLS13) && defined(HAVE_CERTIFICATE_STATUS_REQUEST)
word32 response_idx; word32 response_idx;
#endif #endif