wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4862 from dgarske/no_server

Browse Source 
Fix typo for no server
This commit is contained in:
Sean Parkinson
2022-02-15 10:31:12 +10:00
committed by GitHub
parent 07045083a9 16566f329e
commit 9906c9c55e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -31321,7 +31321,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
#if defined(HAVE_SECURE_RENEGOTIATION) && \ #if defined(HAVE_SECURE_RENEGOTIATION) && \
!defined(WOLFSSL_NO_SERVER) !defined(NO_WOLFSSL_SERVER)
/* handle generation of server's hello_request (0) */ /* handle generation of server's hello_request (0) */
int SendHelloRequest(WOLFSSL* ssl) int SendHelloRequest(WOLFSSL* ssl)
@ -31389,7 +31389,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
return ret; return ret;
} }
#endif /* HAVE_SECURE_RENEGOTIATION && !WOLFSSL_NO_SERVER */ #endif /* HAVE_SECURE_RENEGOTIATION && !NO_WOLFSSL_SERVER */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
/* handle generation of DTLS hello_verify_request (3) */ /* handle generation of DTLS hello_verify_request (3) */

8
wolfssl/internal.h
View File

@ -1571,7 +1571,7 @@ enum Misc {
#define SESSION_TICKET_HINT_DEFAULT 300 #define SESSION_TICKET_HINT_DEFAULT 300
#endif #endif
#if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(WOLFSSL_NO_SERVER) #if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(NO_WOLFSSL_SERVER)
/* Check chosen encryption is available. */ /* Check chosen encryption is available. */
#if !(defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) && \ #if !(defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) && \
defined(WOLFSSL_TICKET_ENC_CHACHA20_POLY1305) defined(WOLFSSL_TICKET_ENC_CHACHA20_POLY1305)
@ -2522,7 +2522,7 @@ typedef struct SessionTicket {
word16 size; word16 size;
} SessionTicket; } SessionTicket;
#if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(WOLFSSL_NO_SERVER) #if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(NO_WOLFSSL_SERVER)
/* Data passed to default SessionTicket enc/dec callback. */ /* Data passed to default SessionTicket enc/dec callback. */
typedef struct TicketEncCbCtx { typedef struct TicketEncCbCtx {
@ -2542,7 +2542,7 @@ typedef struct TicketEncCbCtx {
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
} TicketEncCbCtx; } TicketEncCbCtx;
#endif /* !WOLFSSL_NO_DEF_TICKET_ENC_CB && !WOLFSSL_NO_SERVER */ #endif /* !WOLFSSL_NO_DEF_TICKET_ENC_CB && !NO_WOLFSSL_SERVER */
WOLFSSL_LOCAL int TLSX_UseSessionTicket(TLSX** extensions, WOLFSSL_LOCAL int TLSX_UseSessionTicket(TLSX** extensions,
SessionTicket* ticket, void* heap); SessionTicket* ticket, void* heap);
@ -4717,7 +4717,7 @@ WOLFSSL_LOCAL int CreateOcspResponse(WOLFSSL* ssl, OcspRequest** ocspRequest,
buffer* response); buffer* response);
#endif #endif
#if defined(HAVE_SECURE_RENEGOTIATION) && \ #if defined(HAVE_SECURE_RENEGOTIATION) && \
!defined(WOLFSSL_NO_SERVER) !defined(NO_WOLFSSL_SERVER)
WOLFSSL_LOCAL int SendHelloRequest(WOLFSSL* ssl); WOLFSSL_LOCAL int SendHelloRequest(WOLFSSL* ssl);
#endif #endif
WOLFSSL_LOCAL int SendCertificateStatus(WOLFSSL* ssl); WOLFSSL_LOCAL int SendCertificateStatus(WOLFSSL* ssl);

2
wolfssl/ssl.h
View File

@ -3780,7 +3780,7 @@ WOLFSSL_API long wolfSSL_SSL_get_secure_renegotiation_support(WOLFSSL* ssl);
/* Session Ticket */ /* Session Ticket */
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
#if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(WOLFSSL_NO_SERVER) #if !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && !defined(NO_WOLFSSL_SERVER)
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && \ #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && \
!defined(WOLFSSL_TICKET_ENC_AES128_GCM) && \ !defined(WOLFSSL_TICKET_ENC_AES128_GCM) && \
!defined(WOLFSSL_TICKET_ENC_AES256_GCM) !defined(WOLFSSL_TICKET_ENC_AES256_GCM)