X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fec%2Fcurve448%2Fword.h;h=258ef5f2539a504fff57648b82195b88a719b054;hp=d4e940d1d611e65569bfbe8fb0bf60cfb80222df;hb=8d55f844b08199e0ac6a2ddc501de39f3237c5e9;hpb=205fd6388175704bd7597dbfb571c84f868ce6da;ds=sidebyside diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h index d4e940d1d6..258ef5f253 100644 --- a/crypto/ec/curve448/word.h +++ b/crypto/ec/curve448/word.h @@ -162,7 +162,6 @@ static ossl_inline big_register_t br_is_zero(big_register_t x) static ossl_inline big_register_t br_is_zero(big_register_t x) { return (big_register_t) _mm_cmpeq_epi32((__m128i) x, _mm_setzero_si128()); - // return (big_register_t)(x == br_set_to_mask(0)); } # elif defined(__ARM_NEON__) static ossl_inline big_register_t br_is_zero(big_register_t x) @@ -196,7 +195,7 @@ static ossl_inline big_register_t br_is_zero(big_register_t x) */ static ossl_inline decaf_bool_t mask_to_bool(mask_t m) { - return (decaf_sword_t) (sword_t) m; + return (decaf_sword_t)(sword_t)m; } static ossl_inline mask_t bool_to_mask(decaf_bool_t m) @@ -204,13 +203,13 @@ static ossl_inline mask_t bool_to_mask(decaf_bool_t m) /* On most arches this will be optimized to a simple cast. */ mask_t ret = 0; unsigned int i; - unsigned int limit = sizeof(decaf_bool_t) / sizeof(mask_t); + if (limit < 1) limit = 1; - for (i = 0; i < limit; i++) { + for (i = 0; i < limit; i++) ret |= ~word_is_zero(m >> (i * 8 * sizeof(word_t))); - } + return ret; }