RT3067: simplify patch

[openssl.git] / crypto / constant_time_locl.h

diff --git a/crypto/constant_time_locl.h b/crypto/constant_time_locl.h
index ccf7b62f5fd147c2f8e08a5ec5b544a9eb286a9f..c0483939fe3dbb2fa137f9f0feb594b587673e9f 100644 (file)
--- a/crypto/constant_time_locl.h
+++ b/crypto/constant_time_locl.h
@@ -106,6 +106,11 @@ static inline unsigned char constant_time_is_zero_8(unsigned int a);
 static inline unsigned int constant_time_eq(unsigned int a, unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
 static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b);
 static inline unsigned int constant_time_eq(unsigned int a, unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
 static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b);

+/* Signed integers. */
+static inline unsigned int constant_time_eq_int(int a, int b);
+/* Convenience method for getting an 8-bit mask. */
+static inline unsigned char constant_time_eq_int_8(int a, int b);
+

 
 /*
  * Returns (mask & a) | (~mask & b).
 
 /*
  * Returns (mask & a) | (~mask & b).


@@ -177,6 +182,16 @@ static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b)
        return (unsigned char)(constant_time_eq(a, b));
        }
 
        return (unsigned char)(constant_time_eq(a, b));
        }
 

+static inline unsigned int constant_time_eq_int(int a, int b)
+       {
+       return constant_time_eq((unsigned)(a), (unsigned)(b));
+       }
+
+static inline unsigned char constant_time_eq_int_8(int a, int b)
+       {
+       return constant_time_eq_8((unsigned)(a), (unsigned)(b));
+       }
+

 static inline unsigned int constant_time_select(unsigned int mask,
        unsigned int a, unsigned int b)
        {
 static inline unsigned int constant_time_select(unsigned int mask,
        unsigned int a, unsigned int b)
        {