From: Matt Caswell <matt@openssl.org>
Date: Fri, 24 Apr 2020 15:20:27 +0000 (+0100)
Subject: Don't export ECX key data twice
X-Git-Tag: openssl-3.0.0-alpha2~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4fe478df04073abf0657506b58ed3f67443fcaf;p=oweals%2Fopenssl.git

Don't export ECX key data twice

We had a redundant couple of lines where we exported key data twice.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11635)
---

diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index 278e548832..d3be2865b9 100644
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -161,10 +161,6 @@ static int ecx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
          && !key_to_params(key, tmpl, NULL))
         goto err;
 
-    if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0
-         && !key_to_params(key, tmpl, NULL))
-        goto err;
-
     params = OSSL_PARAM_BLD_to_param(tmpl);
     if (params == NULL)
         goto err;