WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:ColtonWilley/wolfssl into rsa_pad_crypto_cb

pull/7907/head
Colton Willey 2024-08-29 11:14:49 -07:00
parent b7299a23c0 31ec2b0acd
commit 50a3a37ff2
7 changed files with 1171 additions and 1159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/dox_comments/header_files/wolfio.h
View File

@ -422,9 +422,9 @@ void wolfSSL_SetIOReadFlags( WOLFSSL* ssl, int flags);
flags parameter may include one or more of the following: flags parameter may include one or more of the following:
#define MSG_OOB 0x1 // process out-of-band data, #define MSG_OOB 0x1 // process out-of-band data,
#define MSG_DONTROUTE 0x4 // bypass routing, use direct interface. #define MSG_DONTROUTE 0x4 // bypass routing, use direct interface.
The flag MSG_OOB is used to send ``out-of-band'' data on sockets that The flag MSG_OOB is used to send 'out-of-band' data on sockets that
support this notion (e.g. SOCK_STREAM); the underlying protocol must also support this notion (e.g. SOCK_STREAM); the underlying protocol must also
support ``out-of-band'' data. MSG_DONTROUTE is usually used only by support 'out-of-band' data. MSG_DONTROUTE is usually used only by
diagnostic or routing programs.” diagnostic or routing programs.”
\return none No returns. \return none No returns.

4
src/ssl.c
View File

@ -3628,7 +3628,7 @@ static int _Rehandshake(WOLFSSL* ssl)
ssl->secure_renegotiation->cache_status = SCR_CACHE_NEEDED; ssl->secure_renegotiation->cache_status = SCR_CACHE_NEEDED;
#if !defined(NO_WOLFSSL_SERVER) #if !defined(NO_WOLFSSL_SERVER) && !defined(WOLFSSL_NO_TLS12)
if (ssl->options.side == WOLFSSL_SERVER_END) { if (ssl->options.side == WOLFSSL_SERVER_END) {
ret = SendHelloRequest(ssl); ret = SendHelloRequest(ssl);
if (ret != 0) { if (ret != 0) {
@ -3636,7 +3636,7 @@ static int _Rehandshake(WOLFSSL* ssl)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
} }
#endif /* !NO_WOLFSSL_SERVER */ #endif /* !NO_WOLFSSL_SERVER && !WOLFSSL_NO_TLS12 */
ret = InitHandshakeHashes(ssl); ret = InitHandshakeHashes(ssl);
if (ret != 0) { if (ret != 0) {

5
support/gen-debug-trace-error-codes.sh
View File

@ -19,8 +19,11 @@ BEGIN {
split($0, errcode_a, "[[:space:]=,]+"); split($0, errcode_a, "[[:space:]=,]+");
if ((errcode_a[1] == "MIN_CODE_E") || if ((errcode_a[1] == "MIN_CODE_E") ||
(errcode_a[1] == "MAX_CODE_E") ||
(errcode_a[1] == "WC_FIRST_E") ||
(errcode_a[1] == "WC_LAST_E") || (errcode_a[1] == "WC_LAST_E") ||
(errcode_a[1] == "MAX_CODE_E")) (errcode_a[1] == "WOLFSSL_FIRST_E") ||
(errcode_a[1] == "WOLFSSL_LAST_E"))
{ {
next; next;
} }

2308
wolfcrypt/test/test.c
View File

File diff suppressed because it is too large Load Diff

4
wolfssl/error-ssl.h
View File

@ -220,7 +220,9 @@ enum wolfSSL_ErrorCodes {
WOLFSSL_LOCAL WOLFSSL_LOCAL
void SetErrorString(int err, char* buff); void SetErrorString(int err, char* buff);
#if defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES) && defined(BUILDING_WOLFSSL) #if defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES) && \
(defined(BUILDING_WOLFSSL) || \
defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES_ALWAYS))
#include <wolfssl/debug-trace-error-codes.h> #include <wolfssl/debug-trace-error-codes.h>
#endif #endif

1
wolfssl/openssl/rsa.h
View File

@ -28,6 +28,7 @@
#include <wolfssl/openssl/bn.h> #include <wolfssl/openssl/bn.h>
#include <wolfssl/openssl/err.h> #include <wolfssl/openssl/err.h>
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/rsa.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
wolfssl/wolfcrypt/error-crypt.h
View File

@ -304,7 +304,9 @@ WOLFSSL_API void wc_ErrorString(int err, char* buff);
WOLFSSL_ABI WOLFSSL_API const char* wc_GetErrorString(int error); WOLFSSL_ABI WOLFSSL_API const char* wc_GetErrorString(int error);
#endif #endif
#if defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES) && defined(BUILDING_WOLFSSL) #if defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES) && \
(defined(BUILDING_WOLFSSL) || \
defined(WOLFSSL_DEBUG_TRACE_ERROR_CODES_ALWAYS))
extern void wc_backtrace_render(void); extern void wc_backtrace_render(void);
#define WC_NO_ERR_TRACE(label) (CONST_NUM_ERR_ ## label) #define WC_NO_ERR_TRACE(label) (CONST_NUM_ERR_ ## label)
#ifndef WOLFSSL_DEBUG_BACKTRACE_RENDER_CLAUSE #ifndef WOLFSSL_DEBUG_BACKTRACE_RENDER_CLAUSE