From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Fri, 10 Jan 2020 11:17:44 +0000 (+0300)
Subject: pk: set generated key algo before calling pct_test
X-Git-Tag: 3.6.12~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9805a4cb266d704f80f1476fa8eb2bd8e4d0010d;p=thirdparty%2Fgnutls.git

pk: set generated key algo before calling pct_test

In wrap_nettle_pk_generate_keys() set params->algo before calling
pct_test() as GOST sign/verify use that field.

Reported-by: Daiki Ueno
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 42d540cb46..823c9b9809 100644
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -2369,6 +2369,8 @@ wrap_nettle_pk_generate_keys(gnutls_pk_algorithm_t algo,
 		return GNUTLS_E_INVALID_REQUEST;
 	}
 
+	params->algo = algo;
+
 #ifdef ENABLE_FIPS140
 	ret = pct_test(algo, params);
 	if (ret < 0) {
@@ -2377,8 +2379,6 @@ wrap_nettle_pk_generate_keys(gnutls_pk_algorithm_t algo,
 	}
 #endif
 
-	params->algo = algo;
-
 	FAIL_IF_LIB_ERROR;
 	return 0;