diff options
| author | Daiki Ueno <dueno@redhat.com> | 2020-05-19 16:18:39 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-05-20 07:00:17 +0200 |
| commit | a53007d1986bcec8b042cabdcecef7e95de68b93 (patch) | |
| tree | d4684fc7558d0b7abfce7b5a0d9c0cfc004eb0bc | |
| parent | 27c29e341656252c9e52bdb581d9c36c16035fc4 (diff) | |
| download | gnutls-tmp-fips-redefinition.tar.gz | |
fips: remove FIPS_STARTUP_ONLY_TEST_CASE macrotmp-fips-redefinition
The macro was intended to avoid non-recoverable errors during library
initialization, but the code path has been removed in commit
3963518d067a64412bbe0aa9ce5fc33ae729c15f.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
| -rw-r--r-- | lib/crypto-selftests.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/crypto-selftests.c b/lib/crypto-selftests.c index f904b029b2..f915b6d744 100644 --- a/lib/crypto-selftests.c +++ b/lib/crypto-selftests.c @@ -1939,13 +1939,6 @@ static int test_mac(gnutls_mac_algorithm_t mac, return ret; \ } -#define FIPS_STARTUP_ONLY_TEST_CASE(x, func, vectors) case x: \ - if (_gnutls_fips_mode_enabled() != 1) { \ - ret = func(x, V(vectors), flags); \ - if (!(flags & GNUTLS_SELF_TEST_FLAG_ALL) || ret < 0) \ - return ret; \ - } - /*- * gnutls_cipher_self_test: * @flags: GNUTLS_SELF_TEST_FLAG flags @@ -2075,7 +2068,7 @@ int gnutls_mac_self_test(unsigned flags, gnutls_mac_algorithm_t mac) switch (mac) { case GNUTLS_MAC_UNKNOWN: - FIPS_STARTUP_ONLY_TEST_CASE(GNUTLS_MAC_MD5, test_mac, hmac_md5_vectors); + NON_FIPS_CASE(GNUTLS_MAC_MD5, test_mac, hmac_md5_vectors); FALLTHROUGH; CASE(GNUTLS_MAC_SHA1, test_mac, hmac_sha1_vectors); FALLTHROUGH; @@ -2135,7 +2128,7 @@ int gnutls_digest_self_test(unsigned flags, gnutls_digest_algorithm_t digest) switch (digest) { case GNUTLS_DIG_UNKNOWN: - FIPS_STARTUP_ONLY_TEST_CASE(GNUTLS_DIG_MD5, test_digest, md5_vectors); + NON_FIPS_CASE(GNUTLS_DIG_MD5, test_digest, md5_vectors); FALLTHROUGH; CASE(GNUTLS_DIG_SHA1, test_digest, sha1_vectors); FALLTHROUGH; |