From f57fcb9c268e1b1e5d191b94770530a233758f86 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 1 Nov 2017 19:37:34 +0100
Subject: [PATCH] Use the correct type for the cmov mask

---
 .../curve25519/ref10/curve25519_ref10.c       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
index 877496f5..b9065fbd 100644
--- a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+++ b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
@@ -176,6 +176,8 @@ fe_neg(fe h, const fe f)
 static void
 fe_cmov(fe f, const fe g, unsigned int b)
 {
+    const uint32_t mask = (uint32_t) (-(int32_t) b);
+
     int32_t f0 = f[0];
     int32_t f1 = f[1];
     int32_t f2 = f[2];
@@ -198,17 +200,16 @@ fe_cmov(fe f, const fe g, unsigned int b)
     int32_t x8 = f8 ^ g[8];
     int32_t x9 = f9 ^ g[9];
 
-    b = (unsigned int) (-(int) b);
-    x0 &= b;
-    x1 &= b;
-    x2 &= b;
-    x3 &= b;
-    x4 &= b;
-    x5 &= b;
-    x6 &= b;
-    x7 &= b;
-    x8 &= b;
-    x9 &= b;
+    x0 &= mask;
+    x1 &= mask;
+    x2 &= mask;
+    x3 &= mask;
+    x4 &= mask;
+    x5 &= mask;
+    x6 &= mask;
+    x7 &= mask;
+    x8 &= mask;
+    x9 &= mask;
     f[0] = f0 ^ x0;
     f[1] = f1 ^ x1;
     f[2] = f2 ^ x2;