Update premain fingerprint.

[openssl.git] / fips / fips_canister.c

diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index 0f6c63d22d131a7c80408e0dc47766f941a9c5df..8a3524952e6deae06fee71bc95f5b7b0cd138c02 100644 (file)
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -22,12 +22,20 @@ const void         *FIPS_text_end(void);
        (defined(__linux) && (defined(__arm) || defined(__arm__)))      || \
        (defined(__i386) || defined(__i386__))                          || \
        (defined(__x86_64) || defined(__x86_64__))                      || \
-       defined(__ANDROID__)                                            || \
        (defined(vax) || defined(__vax__))
 #  define POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION
 # endif
 #endif
 
+#if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
+# if   (defined(__ANDROID__) && (defined(__arm__) || defined(__arm)    || \
+                                 defined(__i386__)|| defined(__i386))) || \
+       (defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)))  || \
+       (defined(__linux)     && defined(__PPC__) && !defined(__PPC64__))
+#  define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
+# endif
+#endif
+
 #if defined(__xlC__) && __xlC__>=0x600 && (defined(_POWER) || defined(_ARCH_PPC))
 static void *instruction_pointer_xlc(void);
 # pragma mc_func instruction_pointer_xlc {\
@@ -40,16 +48,30 @@ static void *instruction_pointer_xlc(void);
 #endif
 
 #ifdef FIPS_START
-#define FIPS_ref_point FIPS_text_start
+# define FIPS_ref_point FIPS_text_start
+# ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
+#  define instruction_pointer  FIPS_text_startX
+# endif
 /* Some compilers put string literals into a separate segment. As we
  * are mostly interested to hash AES tables in .rodata, we declare
  * reference points accordingly. In case you wonder, the values are
  * big-endian encoded variable names, just to prevent these arrays
  * from being merged by linker. */
+# if defined(_MSC_VER)
+#  pragma section("fipsro$a",read)
+   __declspec(allocate("fipsro$a"))
+# endif
 const unsigned int FIPS_rodata_start[]=
        { 0x46495053, 0x5f726f64, 0x6174615f, 0x73746172 };
 #else
-#define FIPS_ref_point FIPS_text_end
+# define FIPS_ref_point FIPS_text_end
+# ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
+#  define instruction_pointer  FIPS_text_endX
+# endif
+# if defined(_MSC_VER)
+#  pragma section("fipsro$c",read)
+   __declspec(allocate("fipsro$c"))
+# endif
 const unsigned int FIPS_rodata_end[]=
        { 0x46495053, 0x5f726f64, 0x6174615f, 0x656e645b };
 #endif
@@ -89,9 +111,10 @@ static void *instruction_pointer(void)
                        "move   %0,$31\n\t"
                        "move   $31,%1"         /* restore ra */
                        : "=r"(ret),"=r"(scratch) );
-# elif defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || \
+# elif defined(__ppc__) || defined(__ppc) || \
+       defined(__powerpc) || defined(__powerpc__) || \
        defined(__POWERPC__) || defined(_POWER) || defined(__PPC__) || \
-       defined(__PPC64__) || defined(__powerpc64__)
+       defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__)
 #   define INSTRUCTION_POINTER_IMPLEMENTED
     void *scratch;
     __asm __volatile ( "mfspr  %1,8\n\t"       /* save lr */
@@ -115,6 +138,9 @@ static void *instruction_pointer(void)
 #   define INSTRUCTION_POINTER_IMPLEMENTED
     __asm __volatile ( "leaq   0(%%rip),%0" : "=r"(ret) );
     ret = (void *)((size_t)ret&~3UL); /* align for better performance */
+# elif defined(__arm) || defined(__arm__)
+#   define INSTRUCTION_POINTER_IMPLEMENTED
+    __asm __volatile ( "sub    %0,pc,#8" : "=r"(ret) );
 # endif
 #elif  defined(__DECC) && defined(__alpha)
 #   define INSTRUCTION_POINTER_IMPLEMENTED
@@ -139,7 +165,9 @@ static void *instruction_pointer(void)
  */
 const void *FIPS_ref_point()
 {
-#if    defined(INSTRUCTION_POINTER_IMPLEMENTED)
+#if    defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
+    return (void *)instruction_pointer;
+#elif  defined(INSTRUCTION_POINTER_IMPLEMENTED)
     return instruction_pointer();
 /* Below we essentially cover vendor compilers which do not support
  * inline assembler... */
@@ -177,8 +205,6 @@ const void *FIPS_ref_point()
 # else
     return (void *)FIPS_ref_point;
 # endif
-#elif  defined(__vxworks)
-    return (void *)FIPS_ref_point;
 /*
  * In case you wonder why there is no #ifdef __linux. All Linux targets
  * are GCC-based and therefore are covered by instruction_pointer above