X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fconstant_time_locl.h;h=6410ca789b07494c1aa3172be4e5e4cd7f7fc1a4;hb=2a3e745a1760e34a86fe36faee613542939b7004;hp=ccb64082fde0ffcb68577912eec5e0619f5ee364;hpb=a2ca66f37c97b611feb56b9b753f380827541683;p=oweals%2Fopenssl.git

diff --git a/crypto/constant_time_locl.h b/crypto/constant_time_locl.h
index ccb64082fd..6410ca789b 100644
--- a/crypto/constant_time_locl.h
+++ b/crypto/constant_time_locl.h
@@ -1,5 +1,5 @@
 /* crypto/constant_time_locl.h */
-/*
+/*-
  * Utilities for constant-time cryptography.
  *
  * Author: Emilia Kasper (emilia@openssl.org)
@@ -53,7 +53,7 @@
 extern "C" {
 #endif
 
-/*
+/*-
  * The boolean methods return a bitmask of all ones (0xff...f) for true
  * and 0 for false. This is useful for choosing a value based on the result
  * of a conditional in constant time. For example,
@@ -112,7 +112,7 @@ static inline unsigned int constant_time_eq_int(int a, int b);
 static inline unsigned char constant_time_eq_int_8(int a, int b);
 
 
-/*
+/*-
  * Returns (mask & a) | (~mask & b).
  *
  * When |mask| is all 1s or all 0s (as returned by the methods above),
@@ -129,7 +129,7 @@ static inline int constant_time_select_int(unsigned int mask, int a, int b);
 
 static inline unsigned int constant_time_msb(unsigned int a)
 	{
-	return -(a >> (sizeof(unsigned int) * 8 - 1));
+	return 0-(a >> (sizeof(a) * 8 - 1));
 	}
 
 static inline unsigned int constant_time_lt(unsigned int a, unsigned int b)