File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -136,21 +136,7 @@ jobs:
136136 working-directory : cpython
137137 run : |
138138 export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/build-dir/lib:$LD_LIBRARY_PATH
139- rm aclocal.m4
139+ rm -f aclocal.m4
140140 autoreconf -if
141141 ./configure --with-wolfssl=$GITHUB_WORKSPACE/build-dir
142- make -j test TESTOPTS="-v \
143- test_ssl \
144- test.test_asyncio.test_ssl \
145- test.test_asyncio.test_sslproto \
146- test_hashlib \
147- test_hmac \
148- test_secrets \
149- test_ftplib \
150- test_imaplib \
151- test_poplib \
152- test_smtplib \
153- test_httplib \
154- test_urllib2_localnet \
155- test_xmlrpc \
156- test_docxmlrpc"
142+ make -j test TESTOPTS="-v ${{ matrix.tests }}"
Original file line number Diff line number Diff line change @@ -14032,7 +14032,12 @@ void* wolfSSL_GetHKDFExtractCtx(WOLFSSL* ssl)
1403214032 }
1403314033 if (i == (int)WOLFSSL_OBJECT_INFO_SZ) {
1403414034 WOLFSSL_MSG("NID not in table");
14035+ #ifdef WOLFSSL_QT
14036+ sName = NULL;
14037+ type = (word32)id;
14038+ #else
1403514039 return NULL;
14040+ #endif
1403614041 }
1403714042
1403814043 #ifdef HAVE_ECC
Original file line number Diff line number Diff line change @@ -5818,16 +5818,18 @@ void wolfSSL_EVP_init(void)
58185818 case WC_HASH_TYPE_MD5_SHA :
58195819 case WC_HASH_TYPE_BLAKE2B :
58205820 case WC_HASH_TYPE_BLAKE2S :
5821+ ret = BAD_FUNC_ARG ;
5822+ break ;
58215823 #if defined(WOLFSSL_SHA3 ) && defined(WOLFSSL_SHAKE128 )
58225824 case WC_HASH_TYPE_SHAKE128 :
58235825 ret = wc_Shake128_Copy ((wc_Shake * )& src -> hash .digest .shake ,
5824- (wc_Sha3 * )& des -> hash .digest .shake );
5826+ (wc_Shake * )& des -> hash .digest .shake );
58255827 break ;
58265828 #endif
58275829 #if defined(WOLFSSL_SHA3 ) && defined(WOLFSSL_SHAKE256 )
58285830 case WC_HASH_TYPE_SHAKE256 :
58295831 ret = wc_Shake256_Copy ((wc_Shake * )& src -> hash .digest .shake ,
5830- (wc_Sha3 * )& des -> hash .digest .shake );
5832+ (wc_Shake * )& des -> hash .digest .shake );
58315833 break ;
58325834 #endif
58335835 default :
Original file line number Diff line number Diff line change 6161#ifdef WOLFSSL_SM3
6262 #include <wolfssl/wolfcrypt/sm3.h>
6363#endif
64- #ifdef HAVE_BLAKE2
65- #include <wolfssl/wolfcrypt/blake2.h>
66- #endif
67- #ifdef HAVE_BLAKE2S
64+ #if defined(HAVE_BLAKE2 ) || defined(HAVE_BLAKE2S )
6865 #include <wolfssl/wolfcrypt/blake2.h>
6966#endif
7067#ifdef WOLFSSL_SM4
You can’t perform that action at this time.
0 commit comments