Commit 10db9f9f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

parent 9f0d2e14

fips/fips_canister.c

+2 −2
Original line number Diff line number Diff line
@@ -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

fips/fips_premain.c

+4 −0
Original line number Diff line number Diff line
@@ -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'))

fips/fipssyms.h

+1 −1
Original line number Diff line number Diff line
@@ -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