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

wolfcrypt/src/port/af_alg/afalg_aes.c: in wc_AesCbc{En,De}crypt(), handle WOLFSSL_AES_CBC_LENGTH_CHECKS as in wolfcrypt/aes.c; in wc_AesGcm{En,De}crypt(), truncate ivSz to WC_SYSTEM_AESGCM_IV if necessary.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-01-25 23:36:01 -06:00
parent 8f2ae77513
commit 78cc2c5c3e
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wolfcrypt/src/port/af_alg/afalg_aes.c
View File

@@ -156,8 +156,14 @@ int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#ifdef WOLFSSL_AES_CBC_LENGTH_CHECKS
if (sz % AES_BLOCK_SIZE) {
return BAD_LENGTH_E;
}
#endif
if (aes->rdFd == WC_SOCK_NOTSET) { if (aes->rdFd == WC_SOCK_NOTSET) {
if ((ret = wc_AesSetup(aes, WC_TYPE_SYMKEY, WC_NAME_AESCBC, if ((ret = wc_AesSetup(aes, WC_TYPE_SYMKEY, WC_NAME_AESCBC,
AES_IV_SIZE, 0)) != 0) { AES_IV_SIZE, 0)) != 0) {
WOLFSSL_MSG("Error with first time setup of AF_ALG socket"); WOLFSSL_MSG("Error with first time setup of AF_ALG socket");
return ret; return ret;
@@ -205,11 +211,18 @@ int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,
struct iovec iov; struct iovec iov;
int ret; int ret;
if (aes == NULL || out == NULL || in == NULL if (aes == NULL || out == NULL || in == NULL) {
|| sz % AES_BLOCK_SIZE != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (sz % AES_BLOCK_SIZE) {
#ifdef WOLFSSL_AES_CBC_LENGTH_CHECKS
return BAD_LENGTH_E;
#else
return BAD_FUNC_ARG;
#endif
}
if (aes->rdFd == WC_SOCK_NOTSET) { if (aes->rdFd == WC_SOCK_NOTSET) {
if ((ret = wc_AesSetup(aes, WC_TYPE_SYMKEY, WC_NAME_AESCBC, if ((ret = wc_AesSetup(aes, WC_TYPE_SYMKEY, WC_NAME_AESCBC,
AES_IV_SIZE, 0)) != 0) { AES_IV_SIZE, 0)) != 0) {
@@ -534,6 +547,9 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (ivSz > WC_SYSTEM_AESGCM_IV)
ivSz = WC_SYSTEM_AESGCM_IV;
if (ivSz != WC_SYSTEM_AESGCM_IV) { if (ivSz != WC_SYSTEM_AESGCM_IV) {
WOLFSSL_MSG("IV size not supported on system"); WOLFSSL_MSG("IV size not supported on system");
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -636,8 +652,9 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
initalCounter[AES_BLOCK_SIZE - 1] = 1; initalCounter[AES_BLOCK_SIZE - 1] = 1;
GHASH(aes, authIn, authInSz, out, sz, authTag, authTagSz); GHASH(aes, authIn, authInSz, out, sz, authTag, authTagSz);
ret = wc_AesEncryptDirect(aes, scratch, initalCounter); ret = wc_AesEncryptDirect(aes, scratch, initalCounter);
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
xorbuf(authTag, scratch, authTagSz); xorbuf(authTag, scratch, authTagSz);
} }
#else #else
@@ -724,6 +741,9 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (ivSz > WC_SYSTEM_AESGCM_IV)
ivSz = WC_SYSTEM_AESGCM_IV;
if (ivSz != WC_SYSTEM_AESGCM_IV) { if (ivSz != WC_SYSTEM_AESGCM_IV) {
WOLFSSL_MSG("IV size not supported on system"); WOLFSSL_MSG("IV size not supported on system");
return BAD_FUNC_ARG; return BAD_FUNC_ARG;