feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

CAVP self test build fixes for AES-CCM and PKCS7

Browse Source
This commit is contained in:
Chris Conlon
2019-06-14 09:43:02 -07:00
parent 2cf4a74b47
commit c2032c64d2
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/pkcs7.c
View File

@ -51,12 +51,6 @@
#include <wolfcrypt/src/misc.c> #include <wolfcrypt/src/misc.c>
#endif #endif
#ifdef HAVE_SELFTEST
enum {
GCM_NONCE_MID_SZ = 12, /* The usual default nonce size for AES-GCM. */
};
#endif
/* direction for processing, encoding or decoding */ /* direction for processing, encoding or decoding */
typedef enum { typedef enum {
WC_PKCS7_ENCODE, WC_PKCS7_ENCODE,

5
wolfcrypt/test/test.c
View File

@ -7939,8 +7939,12 @@ int aesccm_test(void)
XMEMSET(p2, 0, sizeof(p2)); XMEMSET(p2, 0, sizeof(p2));
XMEMSET(iv2, 0, sizeof(iv2)); XMEMSET(iv2, 0, sizeof(iv2));
#ifndef HAVE_SELFTEST
/* selftest build does not have wc_AesCcmSetNonce() or
* wc_AesCcmEncrypt_ex() */
if (wc_AesCcmSetKey(&enc, k, sizeof(k)) != 0) if (wc_AesCcmSetKey(&enc, k, sizeof(k)) != 0)
return -8220; return -8220;
if (wc_AesCcmSetNonce(&enc, iv, sizeof(iv)) != 0) if (wc_AesCcmSetNonce(&enc, iv, sizeof(iv)) != 0)
return -8221; return -8221;
if (wc_AesCcmEncrypt_ex(&enc, c2, p, sizeof(c2), iv2, sizeof(iv2), if (wc_AesCcmEncrypt_ex(&enc, c2, p, sizeof(c2), iv2, sizeof(iv2),
@ -7952,6 +7956,7 @@ int aesccm_test(void)
return -8224; return -8224;
if (XMEMCMP(t, t2, sizeof(t2))) if (XMEMCMP(t, t2, sizeof(t2)))
return -8225; return -8225;
#endif
return 0; return 0;
} }

8
wolfssl/wolfcrypt/pkcs7.h
View File

@ -153,9 +153,11 @@ enum Pkcs7_Misc {
MAX_RECIP_SZ = MAX_VERSION_SZ + MAX_RECIP_SZ = MAX_VERSION_SZ +
MAX_SEQ_SZ + ASN_NAME_MAX + MAX_SN_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) #if (defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
/* In the event of fips cert 3389 these enums are not in aes.h for use (HAVE_FIPS_VERSION >= 2)) || defined(HAVE_SELFTEST)
* with pkcs7 so enumerate it here outside the fips boundary */ /* In the event of fips cert 3389 or CAVP selftest build, 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. */ GCM_NONCE_MID_SZ = 12, /* The usual default nonce size for AES-GCM. */
CCM_NONCE_MIN_SZ = 7, CCM_NONCE_MIN_SZ = 7,
#endif #endif