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

Jenkins fixes

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-11-29 18:02:36 +01:00
parent 9337cfbb16
commit 3edfcfe162
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/dox_comments/header_files/ssl.h
View File

@ -14931,8 +14931,8 @@ WOLFSSL_CIPHERSUITE_INFO wolfSSL_get_ciphersuite_info(byte first,
\brief This returns information about the hash and signature algorithm \brief This returns information about the hash and signature algorithm
directly from the raw ciphersuite bytes. directly from the raw ciphersuite bytes.
\param [in] first First byte of the hash and signature algorith \param [in] first First byte of the hash and signature algorithm
\param [in] second Second byte of the hash and signature algorith \param [in] second Second byte of the hash and signature algorithm
\param [out] hashAlgo The enum wc_HashType of the MAC algorithm \param [out] hashAlgo The enum wc_HashType of the MAC algorithm
\param [out] sigAlgo The enum Key_Sum of the authentication algorithm \param [out] sigAlgo The enum Key_Sum of the authentication algorithm
@ -14954,4 +14954,4 @@ WOLFSSL_CIPHERSUITE_INFO wolfSSL_get_ciphersuite_info(byte first,
\sa wolfSSL_get_ciphersuite_info \sa wolfSSL_get_ciphersuite_info
*/ */
void wolfSSL_get_sigalg_info(byte first, byte second, void wolfSSL_get_sigalg_info(byte first, byte second,
enum wc_HashType* hashAlgo, enum Key_Sum* sigAlgo); int* hashAlgo, int* sigAlgo);

2
src/internal.c
View File

@ -4236,7 +4236,7 @@ void InitSuites(Suites* suites, ProtocolVersion pv, int keySz, word16 haveRSA,
* hashalgo The hash algorithm. * hashalgo The hash algorithm.
* hsType The signature type. * hsType The signature type.
*/ */
WC_INLINE void DecodeSigAlg(const byte* input, byte* hashAlgo, byte* hsType) void DecodeSigAlg(const byte* input, byte* hashAlgo, byte* hsType)
{ {
*hsType = invalid_sa_algo; *hsType = invalid_sa_algo;
switch (input[0]) { switch (input[0]) {

12
src/ssl.c
View File

@ -16338,8 +16338,14 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return info; return info;
} }
/**
* @param first First byte of the hash and signature algorithm
* @param second Second byte of the hash and signature algorithm
* @param hashAlgo The enum wc_HashType of the MAC algorithm
* @param sigAlgo The enum Key_Sum of the authentication algorithm
*/
void wolfSSL_get_sigalg_info(byte first, byte second, void wolfSSL_get_sigalg_info(byte first, byte second,
enum wc_HashType* hashAlgo, enum Key_Sum* sigAlgo) int* hashAlgo, int* sigAlgo)
{ {
byte input[2]; byte input[2];
byte hashType; byte hashType;
@ -16399,7 +16405,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
case invalid_sa_algo: case invalid_sa_algo:
default: default:
*hashAlgo = WC_HASH_TYPE_NONE; *hashAlgo = WC_HASH_TYPE_NONE;
*sigAlgo = (enum Key_Sum)0; *sigAlgo = 0;
return; return;
} }
@ -16439,7 +16445,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break; break;
default: default:
*hashAlgo = WC_HASH_TYPE_NONE; *hashAlgo = WC_HASH_TYPE_NONE;
*sigAlgo = (enum Key_Sum)0; *sigAlgo = 0;
return; return;
} }
} }

12
tests/api.c
View File

@ -44865,8 +44865,8 @@ static int test_wolfSSL_cert_cb_dyn_ciphers_certCB(WOLFSSL* ssl, void* arg)
haveECC = 0; haveECC = 0;
} }
for (idx = 0; idx < hashSigAlgoSz; idx += 2) { for (idx = 0; idx < hashSigAlgoSz; idx += 2) {
enum wc_HashType hashAlgo; int hashAlgo;
enum Key_Sum sigAlgo; int sigAlgo;
wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1], wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1],
&hashAlgo, &sigAlgo); &hashAlgo, &sigAlgo);
@ -45078,8 +45078,8 @@ static int test_wolfSSL_sigalg_info(void)
InitSuitesHashSigAlgo_ex2(hashSigAlgo, allSigAlgs, 1, 0xFFFFFFFF, &len); InitSuitesHashSigAlgo_ex2(hashSigAlgo, allSigAlgs, 1, 0xFFFFFFFF, &len);
for (idx = 0; idx < len; idx += 2) { for (idx = 0; idx < len; idx += 2) {
enum wc_HashType hashAlgo; int hashAlgo;
enum Key_Sum sigAlgo; int sigAlgo;
wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1], wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1],
&hashAlgo, &sigAlgo); &hashAlgo, &sigAlgo);
@ -45091,8 +45091,8 @@ static int test_wolfSSL_sigalg_info(void)
InitSuitesHashSigAlgo_ex2(hashSigAlgo, allSigAlgs | SIG_ANON, 1, InitSuitesHashSigAlgo_ex2(hashSigAlgo, allSigAlgs | SIG_ANON, 1,
0xFFFFFFFF, &len); 0xFFFFFFFF, &len);
for (idx = 0; idx < len; idx += 2) { for (idx = 0; idx < len; idx += 2) {
enum wc_HashType hashAlgo; int hashAlgo;
enum Key_Sum sigAlgo; int sigAlgo;
wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1], wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1],
&hashAlgo, &sigAlgo); &hashAlgo, &sigAlgo);

4
wolfssl/ssl.h
View File

@ -1531,7 +1531,9 @@ WOLFSSL_API int wolfSSL_sk_push_node(WOLFSSL_STACK** stack, WOLFSSL_STACK* in);
WOLFSSL_API WOLFSSL_STACK* wolfSSL_sk_get_node(WOLFSSL_STACK* sk, int idx); WOLFSSL_API WOLFSSL_STACK* wolfSSL_sk_get_node(WOLFSSL_STACK* sk, int idx);
WOLFSSL_API int wolfSSL_sk_push(WOLFSSL_STACK *st, const void *data); WOLFSSL_API int wolfSSL_sk_push(WOLFSSL_STACK *st, const void *data);
#if defined(HAVE_OCSP) || defined(HAVE_CRL)
#include "wolfssl/wolfcrypt/asn.h" #include "wolfssl/wolfcrypt/asn.h"
#endif
#if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA) || defined(WOLFSSL_QT) #if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA) || defined(WOLFSSL_QT)
WOLFSSL_API int wolfSSL_sk_ACCESS_DESCRIPTION_push( WOLFSSL_API int wolfSSL_sk_ACCESS_DESCRIPTION_push(
@ -2131,7 +2133,7 @@ typedef struct WOLFSSL_CIPHERSUITE_INFO {
WOLFSSL_API WOLFSSL_CIPHERSUITE_INFO wolfSSL_get_ciphersuite_info(byte first, WOLFSSL_API WOLFSSL_CIPHERSUITE_INFO wolfSSL_get_ciphersuite_info(byte first,
byte second); byte second);
WOLFSSL_API void wolfSSL_get_sigalg_info(byte first, WOLFSSL_API void wolfSSL_get_sigalg_info(byte first,
byte second, enum wc_HashType* hashAlgo, enum Key_Sum* sigAlgo); byte second, int* hashAlgo, int* sigAlgo);
WOLFSSL_LOCAL int CertSetupCbWrapper(WOLFSSL* ssl); WOLFSSL_LOCAL int CertSetupCbWrapper(WOLFSSL* ssl);
WOLFSSL_API void* wolfSSL_X509_STORE_CTX_get_ex_data( WOLFSSL_API void* wolfSSL_X509_STORE_CTX_get_ex_data(