Make the inline const-time functions static.

"inline" without static is not correct as the compiler may choose to ignore it
and will then either emit an external definition, or expect one.

Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit 86f50b36e63275a916b147f9d8764e3c0c060fdb)

diff --git a/crypto/constant_time_locl.h b/crypto/constant_time_locl.h
index 782da6c8b252e57dc3d042bc7f40e63bce772b8f..0d3acd58b3a4da97a8ac83b5224209d6ac4aa6ea 100644 (file)
--- a/crypto/constant_time_locl.h
+++ b/crypto/constant_time_locl.h
@@ -81,38 +81,38 @@ static inline unsigned int constant_time_msb(unsigned int a);
 /*
  * Returns 0xff..f if a < b and 0 otherwise.
  */
 /*
  * Returns 0xff..f if a < b and 0 otherwise.
  */

-inline unsigned int constant_time_lt(unsigned int a, unsigned int b);
+static inline unsigned int constant_time_lt(unsigned int a, unsigned int b);

 /* Convenience method for getting an 8-bit mask. */
 /* Convenience method for getting an 8-bit mask. */

-inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b);
+static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b);

 
 /*
  * Returns 0xff..f if a >= b and 0 otherwise.
  */
 
 /*
  * Returns 0xff..f if a >= b and 0 otherwise.
  */

-inline unsigned int constant_time_ge(unsigned int a, unsigned int b);
+static inline unsigned int constant_time_ge(unsigned int a, unsigned int b);

 /* Convenience method for getting an 8-bit mask. */
 /* Convenience method for getting an 8-bit mask. */

-inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b);
+static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b);

 
 /*
  * Returns 0xff..f if a == 0 and 0 otherwise.
  */
 
 /*
  * Returns 0xff..f if a == 0 and 0 otherwise.
  */

-inline unsigned int constant_time_is_zero(unsigned int a);
+static inline unsigned int constant_time_is_zero(unsigned int a);

 /* Convenience method for getting an 8-bit mask. */
 /* Convenience method for getting an 8-bit mask. */

-inline unsigned char constant_time_is_zero_8(unsigned int a);
+static inline unsigned char constant_time_is_zero_8(unsigned int a);

 
 
 /*
  * Returns 0xff..f if a == b and 0 otherwise.
  */
 
 
 /*
  * Returns 0xff..f if a == b and 0 otherwise.
  */

-inline unsigned int constant_time_eq(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. */
 /* Convenience method for getting an 8-bit mask. */

-inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b);
+static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b);

 
 static inline unsigned int constant_time_msb(unsigned int a)
        {
        return (unsigned int)((int)(a) >> (sizeof(int) * 8 - 1));
        }
 
 
 static inline unsigned int constant_time_msb(unsigned int a)
        {
        return (unsigned int)((int)(a) >> (sizeof(int) * 8 - 1));
        }
 

-inline unsigned int constant_time_lt(unsigned int a, unsigned int b)
+static inline unsigned int constant_time_lt(unsigned int a, unsigned int b)

        {
        unsigned int lt;
        /* Case 1: msb(a) == msb(b). a < b iff the MSB of a - b is set.*/
        {
        unsigned int lt;
        /* Case 1: msb(a) == msb(b). a < b iff the MSB of a - b is set.*/


@@ -122,12 +122,12 @@ inline unsigned int constant_time_lt(unsigned int a, unsigned int b)
        return constant_time_msb(lt);
        }
 
        return constant_time_msb(lt);
        }
 

-inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b)
+static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b)

        {
        return (unsigned char)(constant_time_lt(a, b));
        }
 
        {
        return (unsigned char)(constant_time_lt(a, b));
        }
 

-inline unsigned int constant_time_ge(unsigned int a, unsigned int b)
+static inline unsigned int constant_time_ge(unsigned int a, unsigned int b)

        {
        unsigned int ge;
        /* Case 1: msb(a) == msb(b). a >= b iff the MSB of a - b is not set.*/
        {
        unsigned int ge;
        /* Case 1: msb(a) == msb(b). a >= b iff the MSB of a - b is not set.*/


@@ -137,27 +137,27 @@ inline unsigned int constant_time_ge(unsigned int a, unsigned int b)
        return constant_time_msb(ge);
        }
 
        return constant_time_msb(ge);
        }
 

-inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b)
+static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b)

        {
        return (unsigned char)(constant_time_ge(a, b));
        }
 
        {
        return (unsigned char)(constant_time_ge(a, b));
        }
 

-inline unsigned int constant_time_is_zero(unsigned int a)
+static inline unsigned int constant_time_is_zero(unsigned int a)

        {
        return constant_time_msb(~a & (a - 1));
        }
 
        {
        return constant_time_msb(~a & (a - 1));
        }
 

-inline unsigned char constant_time_is_zero_8(unsigned int a)
+static inline unsigned char constant_time_is_zero_8(unsigned int a)

        {
        return (unsigned char)(constant_time_is_zero(a));
        }
 
        {
        return (unsigned char)(constant_time_is_zero(a));
        }
 

-inline unsigned int constant_time_eq(unsigned int a, unsigned int b)
+static inline unsigned int constant_time_eq(unsigned int a, unsigned int b)

        {
        return constant_time_is_zero(a ^ b);
        }
 
        {
        return constant_time_is_zero(a ^ b);
        }
 

-inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b)
+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));
        }