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

Convert to pointer to pass static memory

Browse Source
This commit is contained in:
Tesfa Mael
2019-08-06 10:47:30 -07:00
parent 000c38ae1f
commit c1938969aa
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/internal.c
View File

@ -5119,6 +5119,15 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
ssl->sessionCtxSz = ctx->sessionCtxSz; ssl->sessionCtxSz = ctx->sessionCtxSz;
XMEMCPY(ssl->sessionCtx, ctx->sessionCtx, ctx->sessionCtxSz); XMEMCPY(ssl->sessionCtx, ctx->sessionCtx, ctx->sessionCtxSz);
ssl->cbioFlag = ctx->cbioFlag; ssl->cbioFlag = ctx->cbioFlag;
if ((ssl->param = (WOLFSSL_X509_VERIFY_PARAM*)XMALLOC(
sizeof(WOLFSSL_X509_VERIFY_PARAM),
ssl->heap, DYNAMIC_TYPE_OPENSSL)) == NULL) {
WOLFSSL_MSG("ssl->param memory error");
return MEMORY_E;
}
XMEMSET(ssl->param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM));
#endif #endif
InitCiphers(ssl); InitCiphers(ssl);
@ -5682,7 +5691,11 @@ void SSL_ResourceFree(WOLFSSL* ssl)
FreeWriteDup(ssl); FreeWriteDup(ssl);
} }
#endif #endif
#ifdef OPENSSL_EXTRA
if (ssl->param) {
XFREE(ssl->param, ssl->heap, DYNAMIC_TYPE_OPENSSL);
}
#endif
#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;
@ -9121,16 +9134,17 @@ static int DoVerifyCallback(WOLFSSL* ssl, int ret, ProcPeerCertArgs* args)
XMEMSET(store->param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM)); XMEMSET(store->param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM));
/* Overwrite with non-default param values in SSL */ /* Overwrite with non-default param values in SSL */
if (ssl->param) {
if (ssl->param->check_time)
store->param->check_time = ssl->param->check_time;
if (ssl->param.check_time) if (ssl->param->flags)
store->param->check_time = ssl->param.check_time; store->param->flags = ssl->param->flags;
if (ssl->param.flags) if (ssl->param->hostName[0])
store->param->flags = ssl->param.flags; XMEMCPY(store->param->hostName, ssl->param->hostName,
WOLFSSL_HOST_NAME_MAX);
if (ssl->param.hostName[0]) }
XMEMCPY(store->param->hostName, ssl->param.hostName,
WOLFSSL_HOST_NAME_MAX);
} }
#endif /* defined(OPENSSL_EXTRA) */ #endif /* defined(OPENSSL_EXTRA) */
#endif /* defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)*/ #endif /* defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)*/

2
src/ssl.c
View File

@ -19766,7 +19766,7 @@ WOLFSSL_X509_VERIFY_PARAM* wolfSSL_get0_param(WOLFSSL* ssl)
if (ssl == NULL) { if (ssl == NULL) {
return NULL; return NULL;
} }
return &ssl->param; return ssl->param;
} }
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB

2
wolfssl/internal.h
View File

@ -3739,7 +3739,7 @@ struct WOLFSSL {
WOLFSSL_BIO* biord; /* socket bio read to free/close */ WOLFSSL_BIO* biord; /* socket bio read to free/close */
WOLFSSL_BIO* biowr; /* socket bio write to free/close */ WOLFSSL_BIO* biowr; /* socket bio write to free/close */
byte sessionCtx[ID_LEN]; /* app session context ID */ byte sessionCtx[ID_LEN]; /* app session context ID */
WOLFSSL_X509_VERIFY_PARAM param; /* verification parameters*/ WOLFSSL_X509_VERIFY_PARAM* param; /* verification parameters*/
#endif #endif
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
unsigned long peerVerifyRet; unsigned long peerVerifyRet;