diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2020-01-12 12:02:16 +0000 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2020-01-12 12:02:16 +0000 |
| commit | e87834cb2524553085819b3c6e493bf3b608ab44 (patch) | |
| tree | 3ef3ffd9df0acb69c7df52b6fa56b444df4ab03a | |
| parent | 85af41159d76fc9733f2ead54a9a2ab64aeb2b80 (diff) | |
| parent | 9805a4cb266d704f80f1476fa8eb2bd8e4d0010d (diff) | |
| download | gnutls-e87834cb2524553085819b3c6e493bf3b608ab44.tar.gz | |
Merge branch 'fix-fips-gost' into 'master'
Fix tests execution when FIPS mode is compiled but not enforced.
See merge request gnutls/gnutls!1164
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | lib/nettle/pk.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29f436596b..e72c39527d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,6 +195,7 @@ FIPS140-2.Fedora.x86_64: - cd build - dash ../configure --disable-gcc-warnings --cache-file ../cache/config.cache --disable-non-suiteb-curves --enable-fips140-mode --disable-doc --disable-full-test-suite --disable-guile - make -j$(nproc) + - make check -j$(nproc) - mkdir -p lib/.libs/fipscheck - fipshmac -d lib/.libs/fipscheck/ -s .hmac lib/.libs/libgnutls.so* - GNUTLS_FORCE_FIPS_MODE=1 make check -j$(nproc) 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; |