wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-10 00:30:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10864 from danielinux/riscv-port-null-checks

Browse Source 
Riscv port bug fixes
This commit is contained in:
Daniel Pouzzner
2026-07-08 17:06:56 -05:00
committed by GitHub
parent 95f337ada4 fc1bb6395d
commit a5dbbf80f5
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/port/riscv/riscv-64-aes.c
+35 -3
View File
@@ -1375,8 +1375,10 @@ int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
#endif /* WOLFSSL_AES_256 */
break;
default:
/* Not set or corrupted: match the generic wc_AesEncrypt
* (aes.c) behavior for an unusable key schedule. */
WOLFSSL_MSG("Bad AES-CTR round value");
ret = BAD_FUNC_ARG;
ret = KEYUSAGE_E;
}
}
@@ -2946,7 +2948,7 @@ int wc_AesSetKey(Aes* aes, const byte* key, word32 keyLen, const byte* iv,
int ret = 0;
/* Validate parameters. */
if (aes == NULL) {
if ((aes == NULL) || (key == NULL)) {
ret = BAD_FUNC_ARG;
}
/* Check key size is supported by AES object. */
@@ -4125,8 +4127,10 @@ int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
#endif /* WOLFSSL_AES_256 */
break;
default:
/* Not set or corrupted: match the generic wc_AesEncrypt
* (aes.c) behavior for an unusable key schedule. */
WOLFSSL_MSG("Bad AES-CTR round value");
ret = BAD_FUNC_ARG;
ret = KEYUSAGE_E;
}
}
@@ -4236,6 +4240,12 @@ int wc_AesEncryptDirect(Aes* aes, byte* out, const byte* in)
WOLFSSL_MSG("Invalid input to wc_AesEncryptDirect");
ret = BAD_FUNC_ARG;
}
/* wc_AesEncrypt is void here so it cannot report an unusable key
* schedule itself; match the generic wc_AesEncrypt (aes.c) check. */
if ((ret == 0) &&
(((aes->rounds >> 1) > 7) || ((aes->rounds >> 1) == 0))) {
ret = KEYUSAGE_E;
}
if (ret == 0) {
wc_AesEncrypt(aes, in, out);
}
@@ -4259,6 +4269,12 @@ int wc_AesDecryptDirect(Aes* aes, byte* out, const byte* in)
WOLFSSL_MSG("Invalid input to wc_AesDecryptDirect");
ret = BAD_FUNC_ARG;
}
/* wc_AesDecrypt is void here so it cannot report an unusable key
* schedule itself; match the generic wc_AesDecrypt (aes.c) check. */
if ((ret == 0) &&
(((aes->rounds >> 1) > 7) || ((aes->rounds >> 1) == 0))) {
ret = KEYUSAGE_E;
}
if (ret == 0) {
wc_AesDecrypt(aes, in, out);
}
@@ -9097,10 +9113,18 @@ int wc_AesCcmEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
/* sanity check on arguments */
if ((aes == NULL) || ((inSz != 0) && ((in == NULL) || (out == NULL))) ||
((authInSz > 0) && (authIn == NULL)) ||
(nonce == NULL) || (authTag == NULL) || (nonceSz < 7) ||
(nonceSz > 13)) {
ret = BAD_FUNC_ARG;
}
/* The block cipher helpers are void here so they cannot report an
* unusable key schedule; match the generic wc_AesEncrypt (aes.c)
* check. */
if ((ret == 0) &&
(((aes->rounds >> 1) > 7) || ((aes->rounds >> 1) == 0))) {
ret = KEYUSAGE_E;
}
if ((ret == 0) && (wc_AesCcmCheckTagSize(authTagSz) != 0)) {
ret = BAD_FUNC_ARG;
@@ -9188,10 +9212,18 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
/* sanity check on arguments */
if ((aes == NULL) || ((inSz != 0) && ((in == NULL) || (out == NULL))) ||
((authInSz > 0) && (authIn == NULL)) ||
(nonce == NULL) || (authTag == NULL) || (nonceSz < 7) ||
(nonceSz > 13)) {
ret = BAD_FUNC_ARG;
}
/* The block cipher helpers are void here so they cannot report an
* unusable key schedule; match the generic wc_AesEncrypt (aes.c)
* check. */
if ((ret == 0) &&
(((aes->rounds >> 1) > 7) || ((aes->rounds >> 1) == 0))) {
ret = KEYUSAGE_E;
}
if ((ret == 0) && (wc_AesCcmCheckTagSize(authTagSz) != 0)) {
ret = BAD_FUNC_ARG;