Skip to content

Commit ea0793f

Browse files
authored
Merge pull request #9428 from dgarske/qat_v5.8.4
Migrate wolfAsyncCrypt repo into wolfSSL proper
2 parents 7c8d7df + a071426 commit ea0793f

File tree

21 files changed

+11352
-161
lines changed

21 files changed

+11352
-161
lines changed

.github/workflows/async.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Test wolfSSL async
3535
run: |
36-
./async-check.sh install
36+
./autogen.sh
3737
./configure ${{ matrix.config }}
3838
make check
3939

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,6 @@ wolfcrypt_first.c
5050
wolfcrypt_last.c
5151
selftest.c
5252
fipsv2.c
53-
src/async.c
54-
wolfssl/async.h
55-
wolfcrypt/src/async.c
56-
wolfssl/wolfcrypt/async.h
57-
wolfcrypt/src/port/intel/quickassist.c
58-
wolfcrypt/src/port/intel/quickassist_mem.c
59-
wolfcrypt/src/port/cavium/cavium_nitrox.c
60-
wolfssl/wolfcrypt/port/intel/quickassist.h
61-
wolfssl/wolfcrypt/port/intel/quickassist_mem.h
62-
wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h
6353
ctaocrypt/benchmark/benchmark
6454
ctaocrypt/test/testctaocrypt
6555
wolfcrypt/benchmark/benchmark

.wolfssl_known_macro_extras

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ CONFIG_WOLFTPM_EXAMPLE_NAME_ESPRESSIF
181181
CONFIG_X86
182182
CONV_WITH_DIV
183183
CPA_CY_API_VERSION_NUM_MAJOR
184+
CPA_CY_API_VERSION_NUM_MINOR
184185
CPU_MIMXRT1176DVMAA_cm7
185186
CPU_MK82FN256VLL15
186187
CRLDP_VALIDATE_DATA
@@ -414,6 +415,7 @@ NO_PKCS7_STREAM
414415
NO_POLY1305_ASM
415416
NO_PUBLIC_CCM_SET_NONCE
416417
NO_PUBLIC_GCM_SET_IV
418+
NO_QAT_RNG
417419
NO_RESUME_SUITE_CHECK
418420
NO_RNG
419421
NO_RNG_MUTEX
@@ -477,6 +479,7 @@ RTC_ALARMSUBSECONDMASK_ALL
477479
RTE_CMSIS_RTOS_RTX
478480
RTOS_MODULE_NET_AVAIL
479481
RTPLATFORM
482+
SAL_IOMMU_CODE
480483
SA_INTERRUPT
481484
SCEKEY_INSTALLED
482485
SHA256_MANY_REGISTERS
@@ -567,8 +570,10 @@ USE_CONTESTMUTEX
567570
USE_ECDSA_KEYSZ_HASH_ALGO
568571
USE_FULL_ASSERT
569572
USE_HAL_DRIVER
573+
USE_LAC_SESSION_FOR_STRUCT_OFFSET
570574
USE_NXP_LTC
571575
USE_NXP_MMCAU
576+
USE_QAE_STATIC_MEM
572577
USE_QAE_THREAD_LS
573578
USE_SECRET_CALLBACK
574579
USE_STSAFE_RNG_SEED
@@ -582,24 +587,26 @@ WC_AES_BS_WORD_SIZE
582587
WC_AES_GCM_DEC_AUTH_EARLY
583588
WC_ASN_HASH_SHA256
584589
WC_ASN_RUNTIME_DATE_CHECK_CONTROL
585-
WC_ASYNC_ENABLE_3DES
586-
WC_ASYNC_ENABLE_AES
587-
WC_ASYNC_ENABLE_ARC4
588-
WC_ASYNC_ENABLE_DH
589-
WC_ASYNC_ENABLE_ECC
590590
WC_ASYNC_ENABLE_ECC_KEYGEN
591-
WC_ASYNC_ENABLE_HMAC
592-
WC_ASYNC_ENABLE_MD5
593-
WC_ASYNC_ENABLE_RSA
594-
WC_ASYNC_ENABLE_RSA_KEYGEN
595-
WC_ASYNC_ENABLE_SHA
596-
WC_ASYNC_ENABLE_SHA224
597-
WC_ASYNC_ENABLE_SHA256
598-
WC_ASYNC_ENABLE_SHA3
599-
WC_ASYNC_ENABLE_SHA384
600-
WC_ASYNC_ENABLE_SHA512
591+
WC_ASYNC_NO_3DES
592+
WC_ASYNC_NO_AES
593+
WC_ASYNC_NO_ARC4
601594
WC_ASYNC_NO_CRYPT
602-
WC_ASYNC_NO_HASH
595+
WC_ASYNC_NO_DH
596+
WC_ASYNC_NO_ECC
597+
WC_ASYNC_NO_HMAC
598+
WC_ASYNC_NO_MD5
599+
WC_ASYNC_NO_PKI
600+
WC_ASYNC_NO_RNG
601+
WC_ASYNC_NO_RSA
602+
WC_ASYNC_NO_RSA_KEYGEN
603+
WC_ASYNC_NO_SHA
604+
WC_ASYNC_NO_SHA224
605+
WC_ASYNC_NO_SHA256
606+
WC_ASYNC_NO_SHA3
607+
WC_ASYNC_NO_SHA384
608+
WC_ASYNC_NO_SHA512
609+
WC_ASYNC_THREAD_BIND
603610
WC_CACHE_RESISTANT_BASE64_TABLE
604611
WC_DILITHIUM_CACHE_PRIV_VECTORS
605612
WC_DILITHIUM_CACHE_PUB_VECTORS
@@ -609,6 +616,7 @@ WC_ECC_NONBLOCK_ONLY
609616
WC_FLAG_DONT_USE_AESNI
610617
WC_FORCE_LINUXKM_FORTIFY_SOURCE
611618
WC_LMS_FULL_HASH
619+
WC_NO_ASYNC_SLEEP
612620
WC_NO_RNG_SIMPLE
613621
WC_NO_STATIC_ASSERT
614622
WC_PKCS11_FIND_WITH_ID_ONLY
@@ -979,6 +987,7 @@ __BCPLUSPLUS__
979987
__BIG_ENDIAN__
980988
__BORLANDC__
981989
__CCRX__
990+
__CC_ARM
982991
__COMPILER_VER__
983992
__COUNTER__
984993
__CYGWIN__

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ EXTRA_DIST+= valgrind-bash.supp
148148
EXTRA_DIST+= fips-hash.sh
149149
EXTRA_DIST+= gencertbuf.pl
150150
EXTRA_DIST+= README.md
151+
EXTRA_DIST+= README-async.md
151152
EXTRA_DIST+= README
152153
EXTRA_DIST+= ChangeLog.md
153154
EXTRA_DIST+= LICENSING

0 commit comments

Comments
 (0)