From 5601aa463433e24b3b0fdeedea54841cf157b1b0 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 29 May 2019 11:12:34 -0600 Subject: [PATCH] PKCS7 w/ FIPS cert 3389 support --- wolfssl/wolfcrypt/pkcs7.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/pkcs7.h b/wolfssl/wolfcrypt/pkcs7.h index 4f26dd939..c49f378ff 100644 --- a/wolfssl/wolfcrypt/pkcs7.h +++ b/wolfssl/wolfcrypt/pkcs7.h @@ -152,7 +152,13 @@ enum Pkcs7_Misc { #endif MAX_RECIP_SZ = MAX_VERSION_SZ + MAX_SEQ_SZ + ASN_NAME_MAX + MAX_SN_SZ + - MAX_SEQ_SZ + MAX_ALGO_SZ + 1 + MAX_ENCRYPTED_KEY_SZ + MAX_SEQ_SZ + MAX_ALGO_SZ + 1 + MAX_ENCRYPTED_KEY_SZ, +#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) + /* In the event of fips cert 3389 these enums are not in aes.h for use + * with pkcs7 so enumerate it here outside the fips boundary */ + GCM_NONCE_MID_SZ = 12, /* The usual default nonce size for AES-GCM. */ + CCM_NONCE_MIN_SZ = 7, +#endif }; enum Cms_Options {