From a2f87476527f2fab134048477195af45de3d08cd Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Tue, 26 Feb 2019 08:48:12 +1000 Subject: [PATCH] Fix DecodePrivateKey to return NOT_COMPILED_IN with PKCS#11 --- src/internal.c | 4 ++++ src/ssl.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index 89d91d7e9..b5c6d429d 100644 --- a/src/internal.c +++ b/src/internal.c @@ -17016,6 +17016,8 @@ int DecodePrivateKey(WOLFSSL *ssl, word16* length) /* Return the maximum signature length. */ *length = (word16)wc_ecc_sig_size_calc(ssl->buffers.keySz); } + #else + ret = NOT_COMPILED_IN; #endif } else if (ssl->buffers.keyType == ecc_dsa_sa_algo) { @@ -17032,6 +17034,8 @@ int DecodePrivateKey(WOLFSSL *ssl, word16* length) /* Return the maximum signature length. */ *length = (word16)wc_ecc_sig_size_calc(ssl->buffers.keySz); } + #else + ret = NOT_COMPILED_IN; #endif } goto exit_dpk; diff --git a/src/ssl.c b/src/ssl.c index 9eb2597f4..c53f2d7f1 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -11168,7 +11168,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) FreeDer(&ctx->privateKey); if (AllocDer(&ctx->privateKey, (word32)sz, PRIVATEKEY_TYPE, - ctx->heap) == 0) { + ctx->heap) == 0) { XMEMCPY(ctx->privateKey->buffer, id, sz); ctx->privateKeyId = 1; ctx->privateKeySz = (word32)keySz;