wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix API unit tests where DH 3072-bit is not enabled.

Browse Source
This commit is contained in:
David Garske
2021-10-14 14:49:46 -07:00
parent a03ed32380
commit de8798f4be
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/api.c
View File

@@ -41156,18 +41156,23 @@ static void test_wolfSSL_X509_PUBKEY_get(void)
static void test_wolfSSL_d2i_DHparams(void) static void test_wolfSSL_d2i_DHparams(void)
{ {
#if !defined(NO_DH) #if !defined(NO_DH) && (defined(HAVE_FFDHE_2048) || defined(HAVE_FFDHE_3072))
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2)) #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
FILE* f = NULL; FILE* f = NULL;
unsigned char buf[4096]; unsigned char buf[4096];
const unsigned char* pt = buf; const unsigned char* pt = buf;
#ifdef HAVE_FFDHE_2048
const char* params1 = "./certs/dh2048.der"; const char* params1 = "./certs/dh2048.der";
#endif
#ifdef HAVE_FFDHE_3072
const char* params2 = "./certs/dh3072.der"; const char* params2 = "./certs/dh3072.der";
#endif
long len = 0; long len = 0;
WOLFSSL_DH* dh = NULL; WOLFSSL_DH* dh = NULL;
XMEMSET(buf, 0, sizeof(buf)); XMEMSET(buf, 0, sizeof(buf));
/* Test 2048 bit parameters */ /* Test 2048 bit parameters */
#ifdef HAVE_FFDHE_2048
printf(testingFmt, "wolfSSL_d2i_DHparams() 2048-bit"); printf(testingFmt, "wolfSSL_d2i_DHparams() 2048-bit");
f = XFOPEN(params1, "rb"); f = XFOPEN(params1, "rb");
AssertTrue(f != XBADFILE); AssertTrue(f != XBADFILE);
@@ -41194,8 +41199,10 @@ static void test_wolfSSL_d2i_DHparams(void)
*buf = 0; *buf = 0;
pt = buf; pt = buf;
#endif /* HAVE_FFDHE_2048 */
/* Test 3072 bit parameters */ /* Test 3072 bit parameters */
#ifdef HAVE_FFDHE_3072
printf(testingFmt, "wolfSSL_d2i_DHparams() 3072-bit"); printf(testingFmt, "wolfSSL_d2i_DHparams() 3072-bit");
f = XFOPEN(params2, "rb"); f = XFOPEN(params2, "rb");
AssertTrue(f != XBADFILE); AssertTrue(f != XBADFILE);
@@ -41215,24 +41222,30 @@ static void test_wolfSSL_d2i_DHparams(void)
DH_free(dh); DH_free(dh);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* HAVE_FFDHE_3072 */
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */ #endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* !NO_DH */ #endif /* !NO_DH */
} }
static void test_wolfSSL_i2d_DHparams(void) static void test_wolfSSL_i2d_DHparams(void)
{ {
#if !defined(NO_DH) #if !defined(NO_DH) && (defined(HAVE_FFDHE_2048) || defined(HAVE_FFDHE_3072))
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2)) #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
FILE* f; FILE* f;
unsigned char buf[4096]; unsigned char buf[4096];
const unsigned char* pt = buf; const unsigned char* pt = buf;
unsigned char* pt2 = buf; unsigned char* pt2 = buf;
#ifdef HAVE_FFDHE_2048
const char* params1 = "./certs/dh2048.der"; const char* params1 = "./certs/dh2048.der";
#endif
#ifdef HAVE_FFDHE_3072
const char* params2 = "./certs/dh3072.der"; const char* params2 = "./certs/dh3072.der";
#endif
long len; long len;
WOLFSSL_DH* dh; WOLFSSL_DH* dh;
/* Test 2048 bit parameters */ /* Test 2048 bit parameters */
#ifdef HAVE_FFDHE_2048
printf(testingFmt, "wolfSSL_i2d_DHparams() 2048-bit"); printf(testingFmt, "wolfSSL_i2d_DHparams() 2048-bit");
f = XFOPEN(params1, "rb"); f = XFOPEN(params1, "rb");
AssertTrue(f != XBADFILE); AssertTrue(f != XBADFILE);
@@ -41257,8 +41270,10 @@ static void test_wolfSSL_i2d_DHparams(void)
*buf = 0; *buf = 0;
pt = buf; pt = buf;
pt2 = buf; pt2 = buf;
#endif
/* Test 3072 bit parameters */ /* Test 3072 bit parameters */
#ifdef HAVE_FFDHE_3072
printf(testingFmt, "wolfSSL_i2d_DHparams() 3072-bit"); printf(testingFmt, "wolfSSL_i2d_DHparams() 3072-bit");
f = XFOPEN(params2, "rb"); f = XFOPEN(params2, "rb");
AssertTrue(f != XBADFILE); AssertTrue(f != XBADFILE);
@@ -41279,6 +41294,7 @@ static void test_wolfSSL_i2d_DHparams(void)
DH_free(dh); DH_free(dh);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */ #endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif #endif
} }
@@ -49365,7 +49381,7 @@ static void test_CONF_CTX_FILE(void)
/* cmd DH parameter */ /* cmd DH parameter */
{ {
#if !defined(NO_DH) && !defined(NO_BIO) #if !defined(NO_DH) && !defined(NO_BIO) && defined(HAVE_FFDHE_3072)
const char* ourdhcert = "./certs/dh3072.pem"; const char* ourdhcert = "./certs/dh3072.pem";
AssertIntEQ(SSL_CONF_cmd(cctx, "DHParameters", NULL), -3); AssertIntEQ(SSL_CONF_cmd(cctx, "DHParameters", NULL), -3);