wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6138 from dgarske/pkcs7_async

Browse Source 
Fix for PKCS7 with asynchronous crypto enabled
This commit is contained in:
Daniel Pouzzner
2023-02-28 17:24:56 -06:00
committed by GitHub
parent 2420d5d3b6 58236632ca
commit 47aad3fedb
1 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
wolfcrypt/src/pkcs7.c
View File

@@ -6894,8 +6894,13 @@ static int wc_PKCS7_EncryptContent(int encryptOID, byte* key, int keySz,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesSetKey(aes, key, keySz, iv, AES_ENCRYPTION); ret = wc_AesSetKey(aes, key, keySz, iv, AES_ENCRYPTION);
if (ret == 0) if (ret == 0) {
ret = wc_AesCbcEncrypt(aes, out, in, inSz); ret = wc_AesCbcEncrypt(aes, out, in, inSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async encrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -6926,9 +6931,14 @@ static int wc_PKCS7_EncryptContent(int encryptOID, byte* key, int keySz,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesGcmSetKey(aes, key, keySz); ret = wc_AesGcmSetKey(aes, key, keySz);
if (ret == 0) if (ret == 0) {
ret = wc_AesGcmEncrypt(aes, out, in, inSz, iv, ivSz, ret = wc_AesGcmEncrypt(aes, out, in, inSz, iv, ivSz,
authTag, authTagSz, aad, aadSz); authTag, authTagSz, aad, aadSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async encrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -6960,9 +6970,14 @@ static int wc_PKCS7_EncryptContent(int encryptOID, byte* key, int keySz,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesCcmSetKey(aes, key, keySz); ret = wc_AesCcmSetKey(aes, key, keySz);
if (ret == 0) if (ret == 0) {
ret = wc_AesCcmEncrypt(aes, out, in, inSz, iv, ivSz, ret = wc_AesCcmEncrypt(aes, out, in, inSz, iv, ivSz,
authTag, authTagSz, aad, aadSz); authTag, authTagSz, aad, aadSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async encrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -6990,8 +7005,13 @@ static int wc_PKCS7_EncryptContent(int encryptOID, byte* key, int keySz,
ret = wc_Des3Init(&des3, heap, devId); ret = wc_Des3Init(&des3, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Des3_SetKey(&des3, key, iv, DES_ENCRYPTION); ret = wc_Des3_SetKey(&des3, key, iv, DES_ENCRYPTION);
if (ret == 0) if (ret == 0) {
ret = wc_Des3_CbcEncrypt(&des3, out, in, inSz); ret = wc_Des3_CbcEncrypt(&des3, out, in, inSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async encrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &des3.asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_Des3Free(&des3); wc_Des3Free(&des3);
} }
break; break;
@@ -7074,8 +7094,13 @@ static int wc_PKCS7_DecryptContent(PKCS7* pkcs7, int encryptOID, byte* key,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesSetKey(aes, key, keySz, iv, AES_DECRYPTION); ret = wc_AesSetKey(aes, key, keySz, iv, AES_DECRYPTION);
if (ret == 0) if (ret == 0) {
ret = wc_AesCbcDecrypt(aes, out, in, inSz); ret = wc_AesCbcDecrypt(aes, out, in, inSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async decrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -7106,9 +7131,14 @@ static int wc_PKCS7_DecryptContent(PKCS7* pkcs7, int encryptOID, byte* key,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesGcmSetKey(aes, key, keySz); ret = wc_AesGcmSetKey(aes, key, keySz);
if (ret == 0) if (ret == 0) {
ret = wc_AesGcmDecrypt(aes, out, in, inSz, iv, ivSz, ret = wc_AesGcmDecrypt(aes, out, in, inSz, iv, ivSz,
authTag, authTagSz, aad, aadSz); authTag, authTagSz, aad, aadSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async decrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -7140,9 +7170,14 @@ static int wc_PKCS7_DecryptContent(PKCS7* pkcs7, int encryptOID, byte* key,
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_AesCcmSetKey(aes, key, keySz); ret = wc_AesCcmSetKey(aes, key, keySz);
if (ret == 0) if (ret == 0) {
ret = wc_AesCcmDecrypt(aes, out, in, inSz, iv, ivSz, ret = wc_AesCcmDecrypt(aes, out, in, inSz, iv, ivSz,
authTag, authTagSz, aad, aadSz); authTag, authTagSz, aad, aadSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async decrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_AesFree(aes); wc_AesFree(aes);
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -7169,8 +7204,13 @@ static int wc_PKCS7_DecryptContent(PKCS7* pkcs7, int encryptOID, byte* key,
ret = wc_Des3Init(&des3, heap, devId); ret = wc_Des3Init(&des3, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Des3_SetKey(&des3, key, iv, DES_DECRYPTION); ret = wc_Des3_SetKey(&des3, key, iv, DES_DECRYPTION);
if (ret == 0) if (ret == 0) {
ret = wc_Des3_CbcDecrypt(&des3, out, in, inSz); ret = wc_Des3_CbcDecrypt(&des3, out, in, inSz);
#ifdef WOLFSSL_ASYNC_CRYPT
/* async decrypt not available here, so block till done */
ret = wc_AsyncWait(ret, &des3.asyncDev, WC_ASYNC_FLAG_NONE);
#endif
}
wc_Des3Free(&des3); wc_Des3Free(&des3);
} }