Fix failing FIPS tests in master stemming from PR #2733

2020-02-20 09:20:59 -07:00 · 2020-02-20 09:20:59 -07:00 · 1f003967df
commit 1f003967df
parent e72b87f372
1 changed files with 3 additions and 1 deletions
--- 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 {