From 95ae2f66a2cd556ec25cecfae6d9b147388e103e Mon Sep 17 00:00:00 2001 From: Vitezslav Cizek Date: Wed, 4 Dec 2019 15:24:17 +0100 Subject: [PATCH] lib: remove obsolete AVOID_INTERNALS Although commit 1f246c381e8a7449d84b143ffe50a0818622d2a3 enabled the self-check functions unconditionally, the #ifdefs AVOID_INTERNALS remained in lib/crypto-selftests-pk.c. Signed-off-by: Vitezslav Cizek --- lib/crypto-selftests-pk.c | 8 -------- 1 file changed, 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 -- GitLab