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

Add NULL checks on key copy

Browse Source
This commit is contained in:
Colton Willey
2024-09-23 10:18:23 -07:00
parent 634e547fba
commit cad2bbd7a7
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/internal.c
View File

@ -6830,10 +6830,18 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
#endif #endif
#ifndef WOLFSSL_BLIND_PRIVATE_KEY #ifndef WOLFSSL_BLIND_PRIVATE_KEY
#ifdef WOLFSSL_COPY_KEY #ifdef WOLFSSL_COPY_KEY
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer, if (ctx->privateKey != NULL) {
ctx->privateKey->length, ctx->privateKey->type, if (ssl->buffers.key != NULL) {
ctx->privateKey->heap); FreeDer(&ssl->buffers.key);
ssl->buffers.weOwnKey = 1; }
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer,
ctx->privateKey->length, ctx->privateKey->type,
ctx->privateKey->heap);
ssl->buffers.weOwnKey = 1;
}
else {
ssl->buffers.key = ctx->privateKey;
}
#else #else
ssl->buffers.key = ctx->privateKey; ssl->buffers.key = ctx->privateKey;
#endif #endif

16
src/ssl.c
View File

@ -20411,10 +20411,18 @@ WOLFSSL_CTX* wolfSSL_set_SSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
#endif #endif
#ifndef WOLFSSL_BLIND_PRIVATE_KEY #ifndef WOLFSSL_BLIND_PRIVATE_KEY
#ifdef WOLFSSL_COPY_KEY #ifdef WOLFSSL_COPY_KEY
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer, if (ctx->privateKey != NULL) {
ctx->privateKey->length, ctx->privateKey->type, if (ssl->buffers.key != NULL) {
ctx->privateKey->heap); FreeDer(&ssl->buffers.key);
ssl->buffers.weOwnKey = 1; }
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer,
ctx->privateKey->length, ctx->privateKey->type,
ctx->privateKey->heap);
ssl->buffers.weOwnKey = 1;
}
else {
ssl->buffers.key = ctx->privateKey;
}
#else #else
ssl->buffers.key = ctx->privateKey; ssl->buffers.key = ctx->privateKey;
#endif #endif