Allow for dynamic base in Win64 FIPS module.

fips/rsa/fips_rsa_selftest.c

@@ -61,6 +61,7 @@
 
 #ifdef OPENSSL_FIPS
 
+__fips_constseg
 static const unsigned char rsa_test_2048_n[] = {
 	0xDB,0x10,0x1A,0xC2,0xA3,0xF1,0xDC,0xFF,0x13,0x6B,0xED,0x44,
 	0xDF,0xF0,0x02,0x6D,0x13,0xC7,0x88,0xDA,0x70,0x6B,0x54,0xF1,
@@ -85,9 +86,11 @@ static const unsigned char rsa_test_2048_n[] = {
 	0xD6,0xB0,0xE2,0x62,0x8F,0x74,0x26,0xC2,0x0C,0xD3,0x9A,0x17,
 	0x47,0xE6,0x8E,0xAB
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_e[] = {
 	0x01,0x00,0x01
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_d[] = {
 	0x52,0x41,0xF4,0xDA,0x7B,0xB7,0x59,0x55,0xCA,0xD4,0x2F,0x0F,
 	0x3A,0xCB,0xA4,0x0D,0x93,0x6C,0xCC,0x9D,0xC1,0xB2,0xFB,0xFD,
@@ -112,6 +115,7 @@ static const unsigned char rsa_test_2048_d[] = {
 	0xA7,0x1D,0xD9,0x1E,0x06,0xCD,0xE8,0xBA,0x2C,0x8C,0x69,0x32,
 	0xEA,0xBE,0x60,0x71
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_p[] = {
 	0xFA,0xAC,0xE1,0x37,0x5E,0x32,0x11,0x34,0xC6,0x72,0x58,0x2D,
 	0x91,0x06,0x3E,0x77,0xE7,0x11,0x21,0xCD,0x4A,0xF8,0xA4,0x3F,
@@ -125,6 +129,7 @@ static const unsigned char rsa_test_2048_p[] = {
 	0x0A,0x3B,0xB3,0xAF,0xE2,0x75,0x36,0x04,0xAC,0x56,0xA0,0xAB,
 	0x52,0xDE,0xCE,0xDD,0x2C,0x28,0x77,0x03
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_q[] = {
 	0xDF,0xB7,0x52,0xB6,0xD7,0xC0,0xE2,0x96,0xE7,0xC9,0xFE,0x5D,
 	0x71,0x5A,0xC4,0x40,0x96,0x2F,0xE5,0x87,0xEA,0xF3,0xA5,0x77,
@@ -138,6 +143,7 @@ static const unsigned char rsa_test_2048_q[] = {
 	0x5B,0x74,0x69,0x73,0x87,0x95,0x05,0x07,0xBE,0x45,0x07,0x17,
 	0x7E,0x4A,0x69,0x22,0xF3,0xDB,0x05,0x39
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_dmp1[] = {
 	0x5E,0xD8,0xDC,0xDA,0x53,0x44,0xC4,0x67,0xE0,0x92,0x51,0x34,
 	0xE4,0x83,0xA5,0x4D,0x3E,0xDB,0xA7,0x9B,0x82,0xBB,0x73,0x81,
@@ -151,6 +157,7 @@ static const unsigned char rsa_test_2048_dmp1[] = {
 	0xE7,0x42,0x51,0xA9,0xC2,0x18,0xB1,0x58,0xB1,0x50,0x91,0xB8,
 	0x61,0x41,0xB6,0xA9,0xCE,0xD4,0x7C,0xBB
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_dmq1[] = {
 	0x54,0x09,0x1F,0x0F,0x03,0xD8,0xB6,0xC5,0x0C,0xE8,0xB9,0x9E,
 	0x0C,0x38,0x96,0x43,0xD4,0xA6,0xC5,0x47,0xDB,0x20,0x0E,0xE5,
@@ -164,6 +171,7 @@ static const unsigned char rsa_test_2048_dmq1[] = {
 	0x1C,0x7B,0x8C,0x29,0x13,0xA3,0x0C,0xB2,0xAD,0xEC,0x6C,0x0F,
 	0x8D,0x27,0x12,0x7B,0x48,0xB2,0xDB,0x31
 };
+__fips_constseg
 static const unsigned char rsa_test_2048_iqmp[] = {
 	0x8D,0x1B,0x05,0xCA,0x24,0x1F,0x0C,0x53,0x19,0x52,0x74,0x63,
 	0x21,0xFA,0x78,0x46,0x79,0xAF,0x5C,0xDE,0x30,0xA4,0x6C,0x20,
@@ -197,8 +205,10 @@ static int setrsakey(RSA *k)
  * kat_tbs.
  */
 
+__fips_constseg
 static const unsigned char kat_tbs[] = "OpenSSL FIPS 140-2 Public Key RSA KAT";
 
+__fips_constseg
 static const unsigned char kat_RSA_PSS_SHA256[] = {
 	0x51,0x4F,0x0B,0x8A,0xE6,0x7F,0xF0,0x39,0x9B,0x5F,0x21,0x26,
 	0x99,0x71,0xDC,0x64,0x5A,0x60,0x9B,0xFB,0xB9,0x48,0xE3,0xD4,

fips/rsa/fips_rsa_sign.c

@@ -74,26 +74,31 @@
 
 /* Standard encodings including NULL parameter */
 
+__fips_constseg
 static const unsigned char sha1_bin[] = {
   0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05,
   0x00, 0x04, 0x14
 };
 
+__fips_constseg
 static const unsigned char sha224_bin[] = {
   0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c
 };
 
+__fips_constseg
 static const unsigned char sha256_bin[] = {
   0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20
 };
 
+__fips_constseg
 static const unsigned char sha384_bin[] = {
   0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30
 };
 
+__fips_constseg
 static const unsigned char sha512_bin[] = {
   0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40
@@ -103,27 +108,32 @@ static const unsigned char sha512_bin[] = {
  * using this format but do tolerate received signatures of this form.
  */
 
-static unsigned char sha1_nn_bin[] = {
+__fips_constseg
+static const unsigned char sha1_nn_bin[] = {
   0x30, 0x1f, 0x30, 0x07, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x04,
   0x14
 };
 
-static unsigned char sha224_nn_bin[] = {
+__fips_constseg
+static const unsigned char sha224_nn_bin[] = {
   0x30, 0x2b, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x04, 0x04, 0x1c
 };
 
-static unsigned char sha256_nn_bin[] = {
+__fips_constseg
+static const unsigned char sha256_nn_bin[] = {
   0x30, 0x2f, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x01, 0x04, 0x20
 };
 
-static unsigned char sha384_nn_bin[] = {
+__fips_constseg
+static const unsigned char sha384_nn_bin[] = {
   0x30, 0x3f, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x02, 0x04, 0x30
 };
 
-static unsigned char sha512_nn_bin[] = {
+__fips_constseg
+static const unsigned char sha512_nn_bin[] = {
   0x30, 0x4f, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
   0x04, 0x02, 0x03, 0x04, 0x40
 };