]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
pk: set generated key algo before calling pct_test
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Fri, 10 Jan 2020 11:17:44 +0000 (14:17 +0300)
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Fri, 10 Jan 2020 11:20:30 +0000 (14:20 +0300)
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>
lib/nettle/pk.c

index 42d540cb460f63973bb44c1c53ce2a506827b765..823c9b98094ec2b1231fae3203d83f4b6fe38c51 100644 (file)
@@ -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;