From 1f8df3e403222f92348c24af6a3f4f02bc4d9cd2 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Wed, 5 Apr 2017 09:25:47 -0600 Subject: [PATCH] fix copy of RSA key from WOLFSSL_EVP_PKEY --- src/ssl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index ba6cf4412..172c7dd84 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -23601,10 +23601,7 @@ WOLFSSL_RSA* wolfSSL_EVP_PKEY_get1_RSA(WOLFSSL_EVP_PKEY* key) return NULL; } - if (key->rsa != NULL) { - XMEMCPY(local, key->rsa, sizeof(WOLFSSL_RSA)); - } - else if (key->type == EVP_PKEY_RSA) { + if (key->type == EVP_PKEY_RSA) { if (wolfSSL_RSA_LoadDer(local, (const unsigned char*)key->pkey.ptr, key->pkey_sz) != SSL_SUCCESS) { /* now try public key */ @@ -23617,9 +23614,11 @@ WOLFSSL_RSA* wolfSSL_EVP_PKEY_get1_RSA(WOLFSSL_EVP_PKEY* key) } } else { + WOLFSSL_MSG("WOLFSSL_EVP_PKEY does not hold an RSA key"); wolfSSL_RSA_free(local); local = NULL; } + return local; }