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

Merge pull request #5959 from douzzer/20230105-wolfsentry-fixes

Browse Source 
20230105-wolfsentry-fixes
This commit is contained in:
JacobBarthelmeh
2023-01-06 11:04:16 -07:00
committed by GitHub
parent 26f9047079 d44130d807
commit 9c2bbc2080
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/client/client.c
View File

@ -4456,7 +4456,7 @@ exit:
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
wolfsentry_ret = wolfsentry_ret =
wolfsentry_shutdown(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(&wolfsentry)); wolfsentry_shutdown(WOLFSENTRY_CONTEXT_ARGS_OUT_EX4(&wolfsentry, NULL));
if (wolfsentry_ret < 0) { if (wolfsentry_ret < 0) {
fprintf(stderr, fprintf(stderr,
"wolfsentry_shutdown() returned " WOLFSENTRY_ERROR_FMT "\n", "wolfsentry_shutdown() returned " WOLFSENTRY_ERROR_FMT "\n",

2
examples/server/server.c
View File

@ -3715,7 +3715,7 @@ exit:
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
wolfsentry_ret = wolfsentry_ret =
wolfsentry_shutdown(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(&wolfsentry)); wolfsentry_shutdown(WOLFSENTRY_CONTEXT_ARGS_OUT_EX4(&wolfsentry, NULL));
if (wolfsentry_ret < 0) { if (wolfsentry_ret < 0) {
fprintf(stderr, fprintf(stderr,
"wolfsentry_shutdown() returned " WOLFSENTRY_ERROR_FMT "\n", "wolfsentry_shutdown() returned " WOLFSENTRY_ERROR_FMT "\n",

9
src/ssl.c
View File

@ -35917,8 +35917,7 @@ int wolfSSL_BN_is_word(const WOLFSSL_BIGNUM* bn, WOLFSSL_BN_ULONG w)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
/* Check operand sizes before value check to avoid pointless comparison */ if (w <= (WOLFSSL_BN_ULONG)MP_MASK) {
if ((sizeof(w) <= sizeof(MP_MASK)) || (w <= (WOLFSSL_BN_ULONG)MP_MASK)) {
if (mp_isword((mp_int*)bn->internal, (mp_digit)w) == MP_YES) { if (mp_isword((mp_int*)bn->internal, (mp_digit)w) == MP_YES) {
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
@ -36576,8 +36575,7 @@ static int wolfSSL_BN_add_word_int(WOLFSSL_BIGNUM *bn, WOLFSSL_BN_ULONG w,
} }
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
/* Check operand sizes before value check to avoid pointless comparison */ if (w <= (WOLFSSL_BN_ULONG)MP_MASK) {
if ((sizeof(w) <= sizeof(MP_MASK)) || (w <= (WOLFSSL_BN_ULONG)MP_MASK)) {
if (sub == 1) { if (sub == 1) {
rc = mp_sub_d((mp_int*)bn->internal, (mp_digit)w, rc = mp_sub_d((mp_int*)bn->internal, (mp_digit)w,
(mp_int*)bn->internal); (mp_int*)bn->internal);
@ -36889,8 +36887,7 @@ WOLFSSL_BN_ULONG wolfSSL_BN_mod_word(const WOLFSSL_BIGNUM *bn,
return (WOLFSSL_BN_ULONG)WOLFSSL_FATAL_ERROR; return (WOLFSSL_BN_ULONG)WOLFSSL_FATAL_ERROR;
} }
/* Check operand sizes before value check to avoid pointless comparison */ if (w <= (WOLFSSL_BN_ULONG)MP_MASK) {
if ((sizeof(w) <= sizeof(MP_MASK)) || (w <= (WOLFSSL_BN_ULONG)MP_MASK)) {
mp_digit bn_ret; mp_digit bn_ret;
if (mp_mod_d((mp_int*)bn->internal, (mp_digit)w, &bn_ret) != MP_OKAY) { if (mp_mod_d((mp_int*)bn->internal, (mp_digit)w, &bn_ret) != MP_OKAY) {
WOLFSSL_MSG("mp_add_d error"); WOLFSSL_MSG("mp_add_d error");

1
wolfssl/test.h
View File

@ -1422,6 +1422,7 @@ static WC_INLINE void tcp_socket(SOCKET_T* sockfd, int udp, int sctp)
#ifndef HAVE_WOLFSENTRY_API_0v8 #ifndef HAVE_WOLFSENTRY_API_0v8
#define WOLFSENTRY_CONTEXT_ARGS_OUT_EX(x) (x) #define WOLFSENTRY_CONTEXT_ARGS_OUT_EX(x) (x)
#define WOLFSENTRY_CONTEXT_ARGS_OUT_EX4(x, y) (x)
#endif #endif
struct wolfsentry_data { struct wolfsentry_data {