diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-12-05 15:46:29 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-12-05 15:46:29 +0000 |
| commit | 89ca230dc3c58301fc2799caf6542c79ea9b567d (patch) | |
| tree | 059c54e44c6a2518a45f0b7687b9dee3fc7d6afe | |
| parent | 376b919beaad894a509013953d4a44f7cbf0a1d8 (diff) | |
| parent | 95ae2f66a2cd556ec25cecfae6d9b147388e103e (diff) | |
| download | gnutls-89ca230dc3c58301fc2799caf6542c79ea9b567d.tar.gz | |
Merge branch 'AVOID_INTERNALS' into 'master'
lib: remove obsolete AVOID_INTERNALS
See merge request gnutls/gnutls!1127
| -rw-r--r-- | lib/crypto-selftests-pk.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/crypto-selftests-pk.c b/lib/crypto-selftests-pk.c index 1aa53ea299..7bdb0973ff 100644 --- a/lib/crypto-selftests-pk.c +++ b/lib/crypto-selftests-pk.c @@ -560,9 +560,6 @@ static int test_known_sig(gnutls_pk_algorithm_t pk, unsigned bits, return 0 -/* This file is also included by the test app in tests/slow/cipher-test, so in that - * case we cannot depend on gnutls internals */ -#ifndef AVOID_INTERNALS /* Known answer tests for DH */ static int test_dh(void) { @@ -751,7 +748,6 @@ cleanup: return ret; } -#endif /*- * gnutls_pk_self_test: @@ -775,7 +771,6 @@ int gnutls_pk_self_test(unsigned flags, gnutls_pk_algorithm_t pk) case GNUTLS_PK_UNKNOWN: FALLTHROUGH; case GNUTLS_PK_DH: -#ifndef AVOID_INTERNALS ret = test_dh(); if (ret < 0) { gnutls_assert(); @@ -784,7 +779,6 @@ int gnutls_pk_self_test(unsigned flags, gnutls_pk_algorithm_t pk) if (!(flags & GNUTLS_SELF_TEST_FLAG_ALL)) return 0; -#endif FALLTHROUGH; case GNUTLS_PK_RSA: PK_KNOWN_TEST(GNUTLS_PK_RSA, 1, 2048, GNUTLS_DIG_SHA256, @@ -814,14 +808,12 @@ int gnutls_pk_self_test(unsigned flags, gnutls_pk_algorithm_t pk) FALLTHROUGH; case GNUTLS_PK_EC: /* Test ECDH and ECDSA */ -#ifndef AVOID_INTERNALS ret = test_ecdh(); if (ret < 0) { gnutls_assert(); goto cleanup; } -#endif /* Test ECDSA */ PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS |