Add ossl_inline

Add macro ossl_inline for use in public headers where a portable inline
is required. Change existing inline to use ossl_inline

Reviewed-by: Kurt Roeckx <kurt@openssl.org>

2 files changed, 70 insertions, 40 deletions

diff --git a/include/internal/constant_time_locl.h b/include/internal/constant_time_locl.h
index c786aea949..8269a328f7 100644
--- a/include/internal/constant_time_locl.h
+++ b/include/internal/constant_time_locl.h
@@ -47,7 +47,7 @@
 #ifndef HEADER_CONSTANT_TIME_LOCL_H
 # define HEADER_CONSTANT_TIME_LOCL_H
 
-# include "e_os.h"              /* For 'inline' */
+# include <openssl/e_os2.h>              /* For 'ossl_inline' */
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,42 +76,45 @@ extern "C" {
  * However, this is not ensured by the C standard so you may need to
  * replace this with something else on odd CPUs.
  */
-static inline unsigned int constant_time_msb(unsigned int a);
+static ossl_inline unsigned int constant_time_msb(unsigned int a);
 
 /*
  * Returns 0xff..f if a < b and 0 otherwise.
  */
-static inline unsigned int constant_time_lt(unsigned int a, unsigned int b);
+static ossl_inline unsigned int constant_time_lt(unsigned int a,
+                                                 unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
-static inline unsigned char constant_time_lt_8(unsigned int a,
-                                               unsigned int b);
+static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
+                                                    unsigned int b);
 
 /*
  * Returns 0xff..f if a >= b and 0 otherwise.
  */
-static inline unsigned int constant_time_ge(unsigned int a, unsigned int b);
+static ossl_inline unsigned int constant_time_ge(unsigned int a,
+                                                 unsigned int b);
 /* Convenience method for getting an 8-bit mask. */
-static inline unsigned char constant_time_ge_8(unsigned int a,
-                                               unsigned int b);
+static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
+                                                    unsigned int b);
 
 /*
  * Returns 0xff..f if a == 0 and 0 otherwise.
  */
-static inline unsigned int constant_time_is_zero(unsigned int a);
+static ossl_inline unsigned int constant_time_is_zero(unsigned int a);
 /* Convenience method for getting an 8-bit mask. */
-static inline unsigned char constant_time_is_zero_8(unsigned int a);
+static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a);
 
 /*
  * Returns 0xff..f if a == b and 0 otherwise.
  */
-static inline unsigned int constant_time_eq(unsigned int a, unsigned int b);
+static ossl_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 ossl_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);
+static ossl_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);
+static ossl_inline unsigned char constant_time_eq_int_8(int a, int b);
 
 /*-
  * Returns (mask & a) | (~mask & b).
@@ -120,86 +123,94 @@ static inline unsigned char constant_time_eq_int_8(int a, int b);
  * the select methods return either |a| (if |mask| is nonzero) or |b|
  * (if |mask| is zero).
  */
-static inline unsigned int constant_time_select(unsigned int mask,
-                                                unsigned int a,
-                                                unsigned int b);
+static ossl_inline unsigned int constant_time_select(unsigned int mask,
+                                                     unsigned int a,
+                                                     unsigned int b);
 /* Convenience method for unsigned chars. */
-static inline unsigned char constant_time_select_8(unsigned char mask,
-                                                   unsigned char a,
-                                                   unsigned char b);
+static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
+                                                        unsigned char a,
+                                                        unsigned char b);
 /* Convenience method for signed integers. */
-static inline int constant_time_select_int(unsigned int mask, int a, int b);
+static ossl_inline int constant_time_select_int(unsigned int mask, int a,
+                                                int b);
 
-static inline unsigned int constant_time_msb(unsigned int a)
+static ossl_inline unsigned int constant_time_msb(unsigned int a)
 {
     return 0 - (a >> (sizeof(a) * 8 - 1));
 }
 
-static inline unsigned int constant_time_lt(unsigned int a, unsigned int b)
+static ossl_inline unsigned int constant_time_lt(unsigned int a,
+                                                 unsigned int b)
 {
     return constant_time_msb(a ^ ((a ^ b) | ((a - b) ^ b)));
 }
 
-static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b)
+static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
+                                                    unsigned int b)
 {
     return (unsigned char)(constant_time_lt(a, b));
 }
 
-static inline unsigned int constant_time_ge(unsigned int a, unsigned int b)
+static ossl_inline unsigned int constant_time_ge(unsigned int a,
+                                                 unsigned int b)
 {
     return ~constant_time_lt(a, b);
 }
 
-static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b)
+static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
+                                                    unsigned int b)
 {
     return (unsigned char)(constant_time_ge(a, b));
 }
 
-static inline unsigned int constant_time_is_zero(unsigned int a)
+static ossl_inline unsigned int constant_time_is_zero(unsigned int a)
 {
     return constant_time_msb(~a & (a - 1));
 }
 
-static inline unsigned char constant_time_is_zero_8(unsigned int a)
+static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a)
 {
     return (unsigned char)(constant_time_is_zero(a));
 }
 
-static inline unsigned int constant_time_eq(unsigned int a, unsigned int b)
+static ossl_inline unsigned int constant_time_eq(unsigned int a,
+                                                 unsigned int b)
 {
     return constant_time_is_zero(a ^ b);
 }
 
-static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b)
+static ossl_inline unsigned char constant_time_eq_8(unsigned int a,
+                                                    unsigned int b)
 {
     return (unsigned char)(constant_time_eq(a, b));
 }
 
-static inline unsigned int constant_time_eq_int(int a, int b)
+static ossl_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)
+static ossl_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 ossl_inline unsigned int constant_time_select(unsigned int mask,
+                                                     unsigned int a,
+                                                     unsigned int b)
 {
     return (mask & a) | (~mask & b);
 }
 
-static inline unsigned char constant_time_select_8(unsigned char mask,
-                                                   unsigned char a,
-                                                   unsigned char b)
+static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
+                                                        unsigned char a,
+                                                        unsigned char b)
 {
     return (unsigned char)(constant_time_select(mask, a, b));
 }
 
-static inline int constant_time_select_int(unsigned int mask, int a, int b)
+static ossl_inline int constant_time_select_int(unsigned int mask, int a,
+                                                int b)
 {
     return (int)(constant_time_select(mask, (unsigned)(a), (unsigned)(b)));
 }
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 23602a5266..07428e9439 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -329,6 +329,25 @@ typedef unsigned __int64 uint64_t;
 #  endif
 # endif
 
+/* ossl_inline: portable inline definition usable in public headers */
+# if !defined(inline) && !defined(__cplusplus)
+#  if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
+   /* just use inline */
+#   define ossl_inline inline
+#  elif defined(__GNUC__) && __GNUC__>=2
+#   define ossl_inline __inline__
+#  elif defined(_MSC_VER)
+  /*
+   * Visual Studio: inline is available in C++ only, however
+   * __inline is available for C, see
+   * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
+   */
+#   define ossl_inline __inline
+#  else
+#   define ossl_inline
+#  endif
+# endif
+
 #ifdef  __cplusplus
 }
 #endif