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

Merge pull request #6245 from lealem47/asyncRelease

Browse Source 
Fixes for the async release
This commit is contained in:
David Garske
2023-03-29 12:33:57 -07:00
committed by GitHub
parent 3841b559ec 8e730534d5
commit 8b34ad7c4d
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -6586,10 +6586,11 @@ AS_IF([test "x$ENABLED_INTEL_QA" = "xyes" || test "x$ENABLED_INTEL_QA_SYNC" = "x
AS_IF([test "x$QAT_DIR" = "xyes"],[AC_MSG_ERROR([need a PATH for --with-intelqa$intelqa_opt])]) AS_IF([test "x$QAT_DIR" = "xyes"],[AC_MSG_ERROR([need a PATH for --with-intelqa$intelqa_opt])])
AM_CPPFLAGS="$AM_CPPFLAGS -I$QAT_DIR/quickassist/include -I$QAT_DIR/quickassist/include/lac -I$QAT_DIR/quickassist/utilities/osal/include \ QAT_FLAGS="-I$QAT_DIR/quickassist/include -I$QAT_DIR/quickassist/include/lac -I$QAT_DIR/quickassist/utilities/osal/include \
-I$QAT_DIR/quickassist/utilities/osal/src/linux/user_space/include -I$QAT_DIR/quickassist/lookaside/access_layer/include \ -I$QAT_DIR/quickassist/utilities/osal/src/linux/user_space/include -I$QAT_DIR/quickassist/lookaside/access_layer/include \
-I$QAT_DIR/quickassist/lookaside/access_layer/src/common/include -I$srcdir/wolfssl -I$srcdir/wolfssl/wolfcrypt/port/intel \ -I$QAT_DIR/quickassist/lookaside/access_layer/src/common/include -I$srcdir/wolfssl -I$srcdir/wolfssl/wolfcrypt/port/intel \
-I$QAT_DIR/quickassist/utilities/libusdm_drv" -I$QAT_DIR/quickassist/utilities/libusdm_drv"
AM_CPPFLAGS="$AM_CPPFLAGS $QAT_FLAGS"
CPPFLAGS="$AM_CPPFLAGS" CPPFLAGS="$AM_CPPFLAGS"
LDFLAGS="$LDFLAGS -L$QAT_DIR/build" LDFLAGS="$LDFLAGS -L$QAT_DIR/build"
@ -8720,6 +8721,10 @@ if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "$ENABLED_LINUXKM" = "no"
then then
SAVE_CFLAGS=$CFLAGS SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -I$srcdir" CFLAGS="$CFLAGS -I$srcdir"
if test "$ENABLED_INTEL_QA" = "yes"
then
CFLAGS="$CFLAGS $QAT_FLAGS"
fi
build_pwd="$(pwd)" build_pwd="$(pwd)"
cd "$srcdir" cd "$srcdir"
openssl_headers=$(echo wolfssl/openssl/*.h) openssl_headers=$(echo wolfssl/openssl/*.h)

4
tests/api.c
View File

@ -61981,6 +61981,10 @@ static int test_openssl_FIPS_drbg(void)
AssertIntNE(XMEMCMP(data1, zeroData, dlen), 0); AssertIntNE(XMEMCMP(data1, zeroData, dlen), 0);
AssertIntNE(XMEMCMP(data1, data2, dlen), 0); AssertIntNE(XMEMCMP(data1, data2, dlen), 0);
AssertIntEQ(FIPS_drbg_uninstantiate(dctx), WOLFSSL_SUCCESS); AssertIntEQ(FIPS_drbg_uninstantiate(dctx), WOLFSSL_SUCCESS);
#ifndef HAVE_GLOBAL_RNG
/* gets freed by wolfSSL_Cleanup() when HAVE_GLOBAL_RNG defined */
wolfSSL_FIPS_drbg_free(dctx);
#endif
res = TEST_RES_CHECK(1); res = TEST_RES_CHECK(1);
#endif #endif

2
wolfcrypt/src/evp.c
View File

@ -4954,7 +4954,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
#endif /* !WOLFSSL_NOSHA512_224 */ #endif /* !WOLFSSL_NOSHA512_224 */
#ifndef WOLFSSL_NOSHA512_224 #ifndef WOLFSSL_NOSHA512_256
const WOLFSSL_EVP_MD* wolfSSL_EVP_sha512_256(void) const WOLFSSL_EVP_MD* wolfSSL_EVP_sha512_256(void)
{ {
WOLFSSL_ENTER("EVP_sha512_256"); WOLFSSL_ENTER("EVP_sha512_256");

5
wolfssl/wolfcrypt/settings.h
View File

@ -2342,7 +2342,10 @@ extern void uITRON4_free(void *p) ;
#ifndef WC_ASYNC_DEV_SIZE #ifndef WC_ASYNC_DEV_SIZE
#define WC_ASYNC_DEV_SIZE 0 #define WC_ASYNC_DEV_SIZE 0
#endif #endif
#ifdef HAVE_INTEL_QA /* Disable SHA512/224 and SHA512/256 support for QAT */
#define WOLFSSL_NOSHA512_224
#define WOLFSSL_NOSHA512_256
#endif
/* leantls checks */ /* leantls checks */
#ifdef WOLFSSL_LEANTLS #ifdef WOLFSSL_LEANTLS
#ifndef HAVE_ECC #ifndef HAVE_ECC