Merge pull request #2261 from kaleb-himes/ZD-5172

PKCS7 w/ FIPS cert 3389 support
This commit is contained in:
Chris Conlon 2019-06-03 11:28:27 -06:00 committed by GitHub
commit 4367761367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 {