fips/*: extend fipsro segmenting to all _MSC_VER builds (including WinCE).

diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index f00fc7b365ae1403a52582d9b2bb6d42369859a1..8a3524952e6deae06fee71bc95f5b7b0cd138c02 100644 (file)
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -57,7 +57,7 @@ static void *instruction_pointer_xlc(void);
  * 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) && defined(_WIN64)
+# if defined(_MSC_VER)
 #  pragma section("fipsro$a",read)
    __declspec(allocate("fipsro$a"))
 # endif
@@ -68,7 +68,7 @@ const unsigned int FIPS_rodata_start[]=
 # ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
 #  define instruction_pointer  FIPS_text_endX
 # endif
-# if defined(_MSC_VER) && defined(_WIN64)
+# if defined(_MSC_VER)
 #  pragma section("fipsro$c",read)
    __declspec(allocate("fipsro$c"))
 # endif

diff --git a/fips/fips_premain.c b/fips/fips_premain.c
index c94568c8c7cda8b68582d8ac6bdb4b735e7cc5b1..526edbb9d2f2684c67885082aec3fe26ff2f5f96 100644 (file)
--- a/fips/fips_premain.c
+++ b/fips/fips_premain.c
@@ -68,6 +68,10 @@
 #define HMAC_SHA1_SIG "?have to make sure this string is unique"
 #endif
 
+#if defined(_MSC_VER)
+# pragma section("fipsro",read)
+# __declspec(allocate("fipsro"))
+#endif
 static const unsigned char FINGERPRINT_ascii_value[41] = HMAC_SHA1_SIG;
 
 #define atox(c) ((c)>='a'?((c)-'a'+10):((c)>='A'?(c)-'A'+10:(c)-'0'))

diff --git a/fips/fipssyms.h b/fips/fipssyms.h
index 67753d803307dadf355d9384fe8b980907c5eecc..448d50554890ab02419f78f64e35591ed2469d19 100644 (file)
--- a/fips/fipssyms.h
+++ b/fips/fipssyms.h
@@ -667,7 +667,7 @@
 #define bn_mul_mont_gather5 fips_bn_mul_mont_gather5
 #define bn_scatter5 fips_bn_scatter5
 
-#if defined(_MSC_VER) && defined(_WIN64)
+#if defined(_MSC_VER)
 # pragma section("fipsro$b",read)
 # define __fips_constseg __declspec(allocate("fipsro$b"))
 #else