From 4b8507813eb515d86f2ecb87c9b9278d69e6b4a2 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 27 Jul 2018 13:34:38 -0700 Subject: [PATCH] Prime Number Testing 1. Also disable the new prime test from TLS while using SELFTEST. --- src/internal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/internal.c b/src/internal.c index c42f00f0b..4be19df41 100644 --- a/src/internal.c +++ b/src/internal.c @@ -19108,7 +19108,8 @@ int SendClientKeyExchange(WOLFSSL* ssl) goto exit_scke; } -#if !defined(HAVE_FIPS) && !defined(WOLFSSL_OLD_PRIME_CHECK) +#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && \ + !defined(WOLFSSL_OLD_PRIME_CHECK) ret = wc_DhSetCheckKey(ssl->buffers.serverDH_Key, ssl->buffers.serverDH_P.buffer, ssl->buffers.serverDH_P.length, @@ -19212,7 +19213,8 @@ int SendClientKeyExchange(WOLFSSL* ssl) goto exit_scke; } -#if !defined(HAVE_FIPS) && !defined(WOLFSSL_OLD_PRIME_CHECK) +#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && \ + !defined(WOLFSSL_OLD_PRIME_CHECK) ret = wc_DhSetCheckKey(ssl->buffers.serverDH_Key, ssl->buffers.serverDH_P.buffer, ssl->buffers.serverDH_P.length, @@ -20935,7 +20937,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, goto exit_sske; } -#if !defined(HAVE_FIPS) && !defined(WOLFSSL_OLD_PRIME_CHECK) +#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && \ + !defined(WOLFSSL_OLD_PRIME_CHECK) ret = wc_DhSetCheckKey(ssl->buffers.serverDH_Key, ssl->buffers.serverDH_P.buffer, ssl->buffers.serverDH_P.length, @@ -24474,7 +24477,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, goto exit_dcke; } -#if !defined(HAVE_FIPS) && !defined(WOLFSSL_OLD_PRIME_CHECK) +#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && \ + !defined(WOLFSSL_OLD_PRIME_CHECK) ret = wc_DhSetCheckKey(ssl->buffers.serverDH_Key, ssl->buffers.serverDH_P.buffer, ssl->buffers.serverDH_P.length, @@ -24539,7 +24543,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, goto exit_dcke; } -#if !defined(HAVE_FIPS) && !defined(WOLFSSL_OLD_PRIME_CHECK) +#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && \ + !defined(WOLFSSL_OLD_PRIME_CHECK) ret = wc_DhSetCheckKey(ssl->buffers.serverDH_Key, ssl->buffers.serverDH_P.buffer, ssl->buffers.serverDH_P.length,