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

Fixes for multi-test pass. Breaks from PR #4807.

Browse Source
This commit is contained in:
David Garske
2022-02-24 11:48:40 -08:00
parent 07fdca1d62
commit 2b794f03c1
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -6843,7 +6843,7 @@ AS_CASE(["$CFLAGS $CPPFLAGS"],[*'WOLFSSL_TRUST_PEER_CERT'*],[ENABLED_TRUSTED_PEE
AS_CASE(["$CFLAGS $CPPFLAGS $AM_CFLAGS"],[*'OPENSSL_COMPATIBLE_DEFAULTS'*], AS_CASE(["$CFLAGS $CPPFLAGS $AM_CFLAGS"],[*'OPENSSL_COMPATIBLE_DEFAULTS'*],
[ENABLED_OPENSSL_COMPATIBLE_DEFAULTS=yes]) [ENABLED_OPENSSL_COMPATIBLE_DEFAULTS=yes])
if test "x$ENABLED_OPENSSL_COMPATIBLE_DEFAULTS" = "xyes" if test "x$ENABLED_OPENSSL_COMPATIBLE_DEFAULTS" = "xyes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TRUST_PEER_CERT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TRUST_PEER_CERT"

8
src/ssl.c
View File

@ -5330,11 +5330,15 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify)
#error CLIENT_SESSION_ROWS too big #error CLIENT_SESSION_ROWS too big
#endif #endif
typedef struct ClientSession { struct ClientSession {
word16 serverRow; /* SessionCache Row id */ word16 serverRow; /* SessionCache Row id */
word16 serverIdx; /* SessionCache Idx (column) */ word16 serverIdx; /* SessionCache Idx (column) */
word32 sessionIDHash; word32 sessionIDHash;
} ClientSession; };
#ifndef WOLFSSL_CLIENT_SESSION_DEFINED
typedef struct ClientSession ClientSession;
#define WOLFSSL_CLIENT_SESSION_DEFINED
#endif
typedef struct ClientRow { typedef struct ClientRow {
int nextIdx; /* where to place next one */ int nextIdx; /* where to place next one */

5
wolfssl/internal.h
View File

@ -1691,7 +1691,10 @@ typedef WOLFSSL_BUFFER_INFO buffer;
typedef struct Suites Suites; typedef struct Suites Suites;
/* Declare opaque struct for API to use */ /* Declare opaque struct for API to use */
typedef struct ClientSession ClientSession; #ifndef WOLFSSL_CLIENT_SESSION_DEFINED
typedef struct ClientSession ClientSession;
#define WOLFSSL_CLIENT_SESSION_DEFINED
#endif
/* defaults to client */ /* defaults to client */
WOLFSSL_LOCAL void InitSSL_Method(WOLFSSL_METHOD* method, ProtocolVersion pv); WOLFSSL_LOCAL void InitSSL_Method(WOLFSSL_METHOD* method, ProtocolVersion pv);