From fe12395e61b6477858f29e16d63c3acf0b214dc6 Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Thu, 5 Mar 2026 08:13:26 -0600 Subject: [PATCH 1/2] Add null check in wolfSSL_EVP_PKEY_encrypt_init / _decrypt_init --- wolfcrypt/src/evp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index cf197ef15b..6747bcfe99 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -3152,7 +3152,7 @@ int wolfSSL_EVP_PKEY_decrypt(WOLFSSL_EVP_PKEY_CTX *ctx, */ int wolfSSL_EVP_PKEY_decrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx) { - if (ctx == NULL) return WOLFSSL_FAILURE; + if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; WOLFSSL_ENTER("wolfSSL_EVP_PKEY_decrypt_init"); switch (ctx->pkey->type) { case WC_EVP_PKEY_RSA: @@ -3256,7 +3256,7 @@ int wolfSSL_EVP_PKEY_encrypt(WOLFSSL_EVP_PKEY_CTX *ctx, */ int wolfSSL_EVP_PKEY_encrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx) { - if (ctx == NULL) return WOLFSSL_FAILURE; + if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; WOLFSSL_ENTER("wolfSSL_EVP_PKEY_encrypt_init"); switch (ctx->pkey->type) { From 6dc4ba8a24fdd6fe7a31243bc95285053dc53599 Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Thu, 5 Mar 2026 08:23:02 -0600 Subject: [PATCH 2/2] Fix from review --- wolfcrypt/src/evp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index 6747bcfe99..697ba5e5e4 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -3152,8 +3152,8 @@ int wolfSSL_EVP_PKEY_decrypt(WOLFSSL_EVP_PKEY_CTX *ctx, */ int wolfSSL_EVP_PKEY_decrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx) { - if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; WOLFSSL_ENTER("wolfSSL_EVP_PKEY_decrypt_init"); + if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; switch (ctx->pkey->type) { case WC_EVP_PKEY_RSA: ctx->op = WC_EVP_PKEY_OP_DECRYPT; @@ -3256,8 +3256,8 @@ int wolfSSL_EVP_PKEY_encrypt(WOLFSSL_EVP_PKEY_CTX *ctx, */ int wolfSSL_EVP_PKEY_encrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx) { - if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; WOLFSSL_ENTER("wolfSSL_EVP_PKEY_encrypt_init"); + if (ctx == NULL || ctx->pkey == NULL) return WOLFSSL_FAILURE; switch (ctx->pkey->type) { case WC_EVP_PKEY_RSA: