summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/ec/curve448/f_generic.c4
-rw-r--r--crypto/ec/curve448/scalar.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/ec/curve448/f_generic.c b/crypto/ec/curve448/f_generic.c
index 6babea6e41..ed8f36d868 100644
--- a/crypto/ec/curve448/f_generic.c
+++ b/crypto/ec/curve448/f_generic.c
@@ -122,7 +122,7 @@ void gf_strong_reduce(gf a)
* it was < p, so now scarry = -1 and this = x - p + 2^255 so let's add
* back in p. will carry back off the top for 2^255.
*/
- assert(word_is_zero(scarry) | word_is_zero(scarry + 1));
+ assert(scarry == 0 || scarry == -1);
scarry_0 = (word_t)scarry;
@@ -135,7 +135,7 @@ void gf_strong_reduce(gf a)
carry >>= LIMB_PLACE_VALUE(LIMBPERM(i));
}
- assert(word_is_zero(carry + scarry_0));
+ assert(carry < 2 && ((word_t)carry + scarry_0) == 0);
}
/* Subtract two gf elements d=a-b */
diff --git a/crypto/ec/curve448/scalar.c b/crypto/ec/curve448/scalar.c
index 0f14bc4b98..b5702c0255 100644
--- a/crypto/ec/curve448/scalar.c
+++ b/crypto/ec/curve448/scalar.c
@@ -135,9 +135,9 @@ void curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
static ossl_inline void scalar_decode_short(curve448_scalar_t s,
const unsigned char *ser,
- unsigned int nbytes)
+ size_t nbytes)
{
- unsigned int i, j, k = 0;
+ size_t i, j, k = 0;
for (i = 0; i < C448_SCALAR_LIMBS; i++) {
c448_word_t out = 0;