From 1f003967dfb2daab5512d3e3212ffeae96f78d87 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Thu, 20 Feb 2020 09:20:59 -0700 Subject: [PATCH] Fix failing FIPS tests in master stemming from PR #2733 --- wolfcrypt/src/asn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 245470fc8..f70fe0f02 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -124,7 +124,9 @@ extern int wc_InitRsaHw(RsaKey* key); #define ERROR_OUT(err, eLabel) { ret = (err); goto eLabel; } -#if defined(HAVE_SELFTEST) || !defined(NO_SKID) +#if defined(HAVE_SELFTEST) || ( !defined(NO_SKID) && \ + ( !defined(HAVE_FIPS) || \ + !defined(HAVE_FIPS_VERSION) )) #ifndef WOLFSSL_AES_KEY_SIZE_ENUM #define WOLFSSL_AES_KEY_SIZE_ENUM enum Asn_Misc {