wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initial implementation of new option to always copy over key to SSL ctx

Browse Source
This commit is contained in:
Colton Willey
2024-09-23 10:04:33 -07:00
parent bc6881974d
commit 634e547fba
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal.c
View File

@@ -6829,7 +6829,14 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
ssl->buffers.certChainCnt = ctx->certChainCnt; ssl->buffers.certChainCnt = ctx->certChainCnt;
#endif #endif
#ifndef WOLFSSL_BLIND_PRIVATE_KEY #ifndef WOLFSSL_BLIND_PRIVATE_KEY
#ifdef WOLFSSL_COPY_KEY
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; ssl->buffers.key = ctx->privateKey;
#endif
#else #else
if (ctx->privateKey != NULL) { if (ctx->privateKey != NULL) {
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer, AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer,

7
src/ssl.c
View File

@@ -20410,7 +20410,14 @@ WOLFSSL_CTX* wolfSSL_set_SSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
ssl->buffers.certChainCnt = ctx->certChainCnt; ssl->buffers.certChainCnt = ctx->certChainCnt;
#endif #endif
#ifndef WOLFSSL_BLIND_PRIVATE_KEY #ifndef WOLFSSL_BLIND_PRIVATE_KEY
#ifdef WOLFSSL_COPY_KEY
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; ssl->buffers.key = ctx->privateKey;
#endif
#else #else
if (ctx->privateKey != NULL) { if (ctx->privateKey != NULL) {
AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer, AllocCopyDer(&ssl->buffers.key, ctx->privateKey->buffer,

5
wolfssl/wolfcrypt/settings.h
View File

@@ -3581,6 +3581,11 @@ extern void uITRON4_free(void *p) ;
#define WOLFSSL_COPY_CERT #define WOLFSSL_COPY_CERT
#endif #endif
#if defined(OPENSSL_ALL) && !defined(WOLFSSL_NO_COPY_KEY)
#undef WOLFSSL_COPY_KEY
#define WOLFSSL_COPY_KEY
#endif
/* /*
* Keeps the "Finished" messages after a TLS handshake for use as the so-called * Keeps the "Finished" messages after a TLS handshake for use as the so-called
* "tls-unique" channel binding. See comment in internal.h around clientFinished * "tls-unique" channel binding. See comment in internal.h around clientFinished