src/ssl.c: revert 2c2740d0dc, as it duplicates optimizer functionality, and produces bugprone-sizeof-expression on clang-tidy and sizeofwithnumericparameter on cppcheck.

This commit is contained in:
Daniel Pouzzner 2023-01-05 18:40:51 -06:00
parent 0b0b980784
commit d44130d807

View File

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