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

fix for case of long type on 32bit systems

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-09-19 21:20:58 -06:00
parent 989179a94a
commit f1ff3da47c
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@ -5720,6 +5720,8 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
ssl->version = ctx->method->version; ssl->version = ctx->method->version;
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
ssl->options.mask = ctx->mask; ssl->options.mask = ctx->mask;
ssl->options.minProto = ctx->minProto;
ssl->options.maxProto = ctx->maxProto;
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13

12
src/ssl.c
View File

@ -16968,7 +16968,7 @@ int wolfSSL_CTX_set_min_proto_version(WOLFSSL_CTX* ctx, int version)
} }
if (version != 0) { if (version != 0) {
proto = version; proto = version;
wolfSSL_CTX_clear_options(ctx, WOLFSSL_OP_MIN_PROTO); ctx->minProto = 0; /* turn min proto flag off */
for (i = 0; i < tblSz; i++) { for (i = 0; i < tblSz; i++) {
if (verTbl[i] == version) { if (verTbl[i] == version) {
break; break;
@ -16981,7 +16981,7 @@ int wolfSSL_CTX_set_min_proto_version(WOLFSSL_CTX* ctx, int version)
ret = Set_CTX_min_proto_version(ctx, verTbl[i]); ret = Set_CTX_min_proto_version(ctx, verTbl[i]);
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
proto = verTbl[i]; proto = verTbl[i];
wolfSSL_CTX_set_options(ctx, WOLFSSL_OP_MIN_PROTO); ctx->minProto = 1; /* turn min proto flag on */
break; break;
} }
} }
@ -17097,7 +17097,7 @@ int wolfSSL_CTX_set_max_proto_version(WOLFSSL_CTX* ctx, int version)
WOLFSSL_OP_NO_TLSv1_2 | WOLFSSL_OP_NO_TLSv1_3); WOLFSSL_OP_NO_TLSv1_2 | WOLFSSL_OP_NO_TLSv1_3);
wolfSSL_CTX_set_min_proto_version(ctx, minProto); wolfSSL_CTX_set_min_proto_version(ctx, minProto);
if (version != 0) { if (version != 0) {
wolfSSL_CTX_clear_options(ctx, WOLFSSL_OP_MAX_PROTO); ctx->maxProto = 0; /* turn max proto flag off */
return Set_CTX_max_proto_version(ctx, version); return Set_CTX_max_proto_version(ctx, version);
} }
@ -17105,7 +17105,7 @@ int wolfSSL_CTX_set_max_proto_version(WOLFSSL_CTX* ctx, int version)
for (i= 0; i < tblSz; i++) { for (i= 0; i < tblSz; i++) {
ret = Set_CTX_max_proto_version(ctx, verTbl[i]); ret = Set_CTX_max_proto_version(ctx, verTbl[i]);
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
wolfSSL_CTX_set_options(ctx, WOLFSSL_OP_MAX_PROTO); ctx->maxProto = 1; /* turn max proto flag on */
break; break;
} }
} }
@ -17342,7 +17342,7 @@ WOLFSSL_API int wolfSSL_CTX_get_min_proto_version(WOLFSSL_CTX* ctx)
WOLFSSL_ENTER("wolfSSL_CTX_get_min_proto_version"); WOLFSSL_ENTER("wolfSSL_CTX_get_min_proto_version");
if (ctx != NULL) { if (ctx != NULL) {
if (wolfSSL_CTX_get_options(ctx) & WOLFSSL_OP_MIN_PROTO) { if (ctx->minProto) {
ret = 0; ret = 0;
} }
else { else {
@ -17400,7 +17400,7 @@ int wolfSSL_CTX_get_max_proto_version(WOLFSSL_CTX* ctx)
options = wolfSSL_CTX_get_options(ctx); options = wolfSSL_CTX_get_options(ctx);
} }
if (options & WOLFSSL_OP_MAX_PROTO) { if (ctx->maxProto) {
ret = 0; ret = 0;
} }
else { else {

4
wolfssl/internal.h
View File

@ -2885,6 +2885,8 @@ struct WOLFSSL_CTX {
short minEccKeySz; /* minimum ECC key size */ short minEccKeySz; /* minimum ECC key size */
#endif #endif
unsigned long mask; /* store SSL_OP_ flags */ unsigned long mask; /* store SSL_OP_ flags */
word16 minProto:1; /* sets min to min available */
word16 maxProto:1; /* sets max to max available */
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
byte sessionCtx[ID_LEN]; /* app session context ID */ byte sessionCtx[ID_LEN]; /* app session context ID */
word32 disabledCurves; /* curves disabled by user */ word32 disabledCurves; /* curves disabled by user */
@ -3566,6 +3568,8 @@ typedef struct Options {
#endif /* NO_PSK */ #endif /* NO_PSK */
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL)
unsigned long mask; /* store SSL_OP_ flags */ unsigned long mask; /* store SSL_OP_ flags */
word16 minProto:1; /* sets min to min available */
word16 maxProto:1; /* sets max to max available */
#endif #endif
/* on/off or small bit flags, optimize layout */ /* on/off or small bit flags, optimize layout */

2
wolfssl/ssl.h
View File

@ -1955,8 +1955,6 @@ enum {
SSL_OP_NO_COMPRESSION = 0x10000000, SSL_OP_NO_COMPRESSION = 0x10000000,
WOLFSSL_OP_NO_TLSv1_3 = 0x20000000, WOLFSSL_OP_NO_TLSv1_3 = 0x20000000,
WOLFSSL_OP_NO_SSLv2 = 0x40000000, WOLFSSL_OP_NO_SSLv2 = 0x40000000,
WOLFSSL_OP_MAX_PROTO = 0x80000000,
WOLFSSL_OP_MIN_PROTO = 0x100000000,
SSL_OP_ALL = SSL_OP_ALL =
(SSL_OP_MICROSOFT_SESS_ID_BUG (SSL_OP_MICROSOFT_SESS_ID_BUG
| SSL_OP_NETSCAPE_CHALLENGE_BUG | SSL_OP_NETSCAPE_CHALLENGE_BUG