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

Don't define a new default NONCE size, instead use existing MAX

Browse Source
This commit is contained in:
Andras Fekete
2022-12-30 16:02:30 -05:00
parent f734f5037d
commit df3c11ad82
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/evp.c
View File

@@ -9122,7 +9122,7 @@ int wolfSSL_EVP_CIPHER_CTX_iv_length(const WOLFSSL_EVP_CIPHER_CTX* ctx)
if (ctx->ivSz != 0) { if (ctx->ivSz != 0) {
return ctx->ivSz; return ctx->ivSz;
} }
return CCM_NONCE_MID_SZ; return CCM_NONCE_MAX_SZ;
#endif #endif
#endif /* (HAVE_FIPS && !HAVE_SELFTEST) || HAVE_FIPS_VERSION >= 2 */ #endif /* (HAVE_FIPS && !HAVE_SELFTEST) || HAVE_FIPS_VERSION >= 2 */
#ifdef WOLFSSL_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
@@ -9239,15 +9239,15 @@ int wolfSSL_EVP_CIPHER_iv_length(const WOLFSSL_EVP_CIPHER* cipher)
#ifdef HAVE_AESCCM #ifdef HAVE_AESCCM
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
if (XSTRCMP(name, EVP_AES_128_CCM) == 0) if (XSTRCMP(name, EVP_AES_128_CCM) == 0)
return CCM_NONCE_MID_SZ; return CCM_NONCE_MAX_SZ;
#endif #endif
#ifdef WOLFSSL_AES_192 #ifdef WOLFSSL_AES_192
if (XSTRCMP(name, EVP_AES_192_CCM) == 0) if (XSTRCMP(name, EVP_AES_192_CCM) == 0)
return CCM_NONCE_MID_SZ; return CCM_NONCE_MAX_SZ;
#endif #endif
#ifdef WOLFSSL_AES_256 #ifdef WOLFSSL_AES_256
if (XSTRCMP(name, EVP_AES_256_CCM) == 0) if (XSTRCMP(name, EVP_AES_256_CCM) == 0)
return CCM_NONCE_MID_SZ; return CCM_NONCE_MAX_SZ;
#endif #endif
#endif /* HAVE_AESCCM */ #endif /* HAVE_AESCCM */
#endif /* (HAVE_FIPS && !HAVE_SELFTEST) || HAVE_FIPS_VERSION >= 2 */ #endif /* (HAVE_FIPS && !HAVE_SELFTEST) || HAVE_FIPS_VERSION >= 2 */

1
wolfssl/wolfcrypt/aes.h
View File

@@ -163,7 +163,6 @@ enum {
GCM_NONCE_MID_SZ = 12, /* The default nonce size for AES-GCM. */ GCM_NONCE_MID_SZ = 12, /* The default nonce size for AES-GCM. */
GCM_NONCE_MIN_SZ = 8, /* wolfCrypt's minimum nonce size allowed. */ GCM_NONCE_MIN_SZ = 8, /* wolfCrypt's minimum nonce size allowed. */
CCM_NONCE_MIN_SZ = 7, CCM_NONCE_MIN_SZ = 7,
CCM_NONCE_MID_SZ = 12, /* The default nonce size for AES-CCM. TODO: Check this*/
CCM_NONCE_MAX_SZ = 13, CCM_NONCE_MAX_SZ = 13,
CTR_SZ = 4, CTR_SZ = 4,
AES_IV_FIXED_SZ = 4, AES_IV_FIXED_SZ = 4,