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

Merge pull request #5019 from douzzer/20220404-linux5v18-etc

Browse Source 
20220404 linux5v18 etc
This commit is contained in:
David Garske
2022-04-04 11:08:18 -07:00
committed by GitHub
parent bb4698a9e8 0d6c283f7a
commit 6513e2ce8f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@@ -16555,7 +16555,6 @@ const char* AlertTypeToString(int type)
static void LogAlert(int type) static void LogAlert(int type)
{ {
(void)type;
#ifdef DEBUG_WOLFSSL #ifdef DEBUG_WOLFSSL
const char* typeStr; const char* typeStr;
char buff[60]; char buff[60];
@@ -16565,6 +16564,8 @@ static void LogAlert(int type)
XSNPRINTF(buff, sizeof(buff), "Alert type: %s", typeStr); XSNPRINTF(buff, sizeof(buff), "Alert type: %s", typeStr);
WOLFSSL_MSG(buff); WOLFSSL_MSG(buff);
} }
#else
(void)type;
#endif /* DEBUG_WOLFSSL */ #endif /* DEBUG_WOLFSSL */
} }

5
tests/api.c
View File

@@ -34851,19 +34851,20 @@ static void msg_cb(int write_p, int version, int content_type,
#endif #endif
static int msgCb(SSL_CTX *ctx, SSL *ssl) static int msgCb(SSL_CTX *ctx, SSL *ssl)
{ {
(void) ctx;
(void) ssl;
#if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO) #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO)
STACK_OF(X509)* sk; STACK_OF(X509)* sk;
X509* x509; X509* x509;
int i, num; int i, num;
BIO* bio; BIO* bio;
#endif #endif
(void) ctx;
printf("\n===== msgcb called ====\n"); printf("\n===== msgcb called ====\n");
#if defined(SESSION_CERTS) && defined(TEST_PEER_CERT_CHAIN) #if defined(SESSION_CERTS) && defined(TEST_PEER_CERT_CHAIN)
AssertTrue(SSL_get_peer_cert_chain(ssl) != NULL); AssertTrue(SSL_get_peer_cert_chain(ssl) != NULL);
AssertIntEQ(((WOLFSSL_X509_CHAIN *)SSL_get_peer_cert_chain(ssl))->count, 2); AssertIntEQ(((WOLFSSL_X509_CHAIN *)SSL_get_peer_cert_chain(ssl))->count, 2);
AssertNotNull(SSL_get0_verified_chain(ssl)); AssertNotNull(SSL_get0_verified_chain(ssl));
#else
(void) ssl;
#endif #endif
#if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO) #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO)

4
wolfssl/wolfcrypt/settings.h
View File

@@ -2235,6 +2235,10 @@ extern void uITRON4_free(void *p) ;
#ifdef WOLFSSL_LINUXKM #ifdef WOLFSSL_LINUXKM
#ifdef HAVE_CONFIG_H
#include <config.h>
#undef HAVE_CONFIG_H
#endif
#ifndef NO_DEV_RANDOM #ifndef NO_DEV_RANDOM
#define NO_DEV_RANDOM #define NO_DEV_RANDOM
#endif #endif