From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 18 Oct 2014 23:35:57 +0000 (+0100)
Subject: Remove fips_constseg references.
X-Git-Tag: master-post-reformat~209
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=e4e5bc39f9481b9c0842ad5b6d0ac338a9742281

Remove fips_constseg references.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index f333c1651a..ba90952829 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -54,7 +54,6 @@ Td3[x] = Si[x].[09, 0d, 0b, 0e];
 Td4[x] = Si[x].[01];
 */
 
-__fips_constseg
 static const u32 Te0[256] = {
     0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
     0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
@@ -121,7 +120,6 @@ static const u32 Te0[256] = {
     0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
     0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
 };
-__fips_constseg
 static const u32 Te1[256] = {
     0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
     0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
@@ -188,7 +186,6 @@ static const u32 Te1[256] = {
     0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
     0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
 };
-__fips_constseg
 static const u32 Te2[256] = {
     0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
     0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
@@ -255,7 +252,6 @@ static const u32 Te2[256] = {
     0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
     0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
 };
-__fips_constseg
 static const u32 Te3[256] = {
     0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
     0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
@@ -323,7 +319,6 @@ static const u32 Te3[256] = {
     0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
 };
 
-__fips_constseg
 static const u32 Td0[256] = {
     0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
     0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
@@ -390,7 +385,6 @@ static const u32 Td0[256] = {
     0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
     0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
 };
-__fips_constseg
 static const u32 Td1[256] = {
     0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
     0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
@@ -457,7 +451,6 @@ static const u32 Td1[256] = {
     0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
     0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
 };
-__fips_constseg
 static const u32 Td2[256] = {
     0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
     0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
@@ -524,7 +517,6 @@ static const u32 Td2[256] = {
     0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
     0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
 };
-__fips_constseg
 static const u32 Td3[256] = {
     0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
     0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
@@ -591,7 +583,6 @@ static const u32 Td3[256] = {
     0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
     0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
 };
-__fips_constseg
 static const u8 Td4[256] = {
     0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
     0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
@@ -626,7 +617,6 @@ static const u8 Td4[256] = {
     0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
     0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
 };
-__fips_constseg
 static const u32 rcon[] = {
 	0x01000000, 0x02000000, 0x04000000, 0x08000000,
 	0x10000000, 0x20000000, 0x40000000, 0x80000000,
diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index b2222a06c9..7b6b95c19c 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -101,7 +101,6 @@
 /* Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should fail. */
 #define MAX_ITERATIONS 50
 
-__fips_constseg
 static const BN_ULONG SQR_tb[16] =
   {     0,     1,     4,     5,    16,    17,    20,    21,
        64,    65,    68,    69,    80,    81,    84,    85 };
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 72c2cf0a3d..cff4fc4f2f 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -68,7 +68,6 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
-__fips_constseg
 const char BN_version[]="Big Number" OPENSSL_VERSION_PTEXT;
 
 /* This stuff appears to be completely unused, so is deprecated */
@@ -143,7 +142,6 @@ const BIGNUM *BN_value_one(void)
 
 int BN_num_bits_word(BN_ULONG l)
 	{
-	__fips_constseg
 	static const unsigned char bits[256]={
 		0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,
 		5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index a5e07acd85..9e8505d8cc 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -68,32 +68,27 @@
 
 /* pre-computed tables are "carry-less" values of modulus*(i+1) */
 #if BN_BITS2 == 64
-__fips_constseg
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
 	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL},
 	{0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL},
 	{0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFCULL,0xFFFFFFFFFFFFFFFFULL}
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_192_sqr[] = {
 	0x0000000000000001ULL,0x0000000000000002ULL,0x0000000000000001ULL,
 	0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
 	{0x0000000000000001ULL,0xFFFFFFFF00000000ULL,
 	 0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL},
 	{0x0000000000000002ULL,0xFFFFFFFE00000000ULL,
 	 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFFULL} /* this one is "carry-full" */
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_224_sqr[] = {
 	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,
 	0xFFFFFFFFFFFFFFFFULL,0x0000000200000000ULL,
 	0x0000000000000000ULL,0xFFFFFFFFFFFFFFFEULL,
 	0xFFFFFFFFFFFFFFFFULL
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
 	{0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL,
 	 0x0000000000000000ULL,0xFFFFFFFF00000001ULL},
@@ -106,14 +101,12 @@ static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
 	{0xFFFFFFFFFFFFFFFBULL,0x00000004FFFFFFFFULL,
 	 0x0000000000000000ULL,0xFFFFFFFB00000005ULL},
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_256_sqr[] = {
 	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,
 	0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFEULL,
 	0x00000001FFFFFFFEULL,0x00000001FFFFFFFEULL,
 	0xFFFFFFFE00000001ULL,0xFFFFFFFE00000002ULL
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
 	{0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,0xFFFFFFFFFFFFFFFEULL,
 	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
@@ -126,21 +119,18 @@ static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
 	{0x00000004FFFFFFFBULL,0xFFFFFFFB00000000ULL,0xFFFFFFFFFFFFFFFAULL,
 	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_384_sqr[] = {
 	0xFFFFFFFE00000001ULL,0x0000000200000000ULL,0xFFFFFFFE00000000ULL,
 	0x0000000200000000ULL,0x0000000000000001ULL,0x0000000000000000ULL,
 	0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL,
 	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_521[] =
 	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
 	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
 	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
 	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
 	0x00000000000001FFULL};
-__fips_constseg
 static const BN_ULONG _nist_p_521_sqr[] = {
 	0x0000000000000001ULL,0x0000000000000000ULL,0x0000000000000000ULL,
 	0x0000000000000000ULL,0x0000000000000000ULL,0x0000000000000000ULL,
@@ -150,32 +140,27 @@ static const BN_ULONG _nist_p_521_sqr[] = {
 	0xFFFFFFFFFFFFFFFFULL,0x000000000003FFFFULL
 	};
 #elif BN_BITS2 == 32
-__fips_constseg
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
 	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
 	{0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
 	{0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_192_sqr[] = {
 	0x00000001,0x00000000,0x00000002,0x00000000,0x00000001,0x00000000,
 	0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
 	{0x00000001,0x00000000,0x00000000,0xFFFFFFFF,
 	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
 	{0x00000002,0x00000000,0x00000000,0xFFFFFFFE,
 	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_224_sqr[] = {
 	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,
 	0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000002,
 	0x00000000,0x00000000,0xFFFFFFFE,0xFFFFFFFF,
 	0xFFFFFFFF,0xFFFFFFFF
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
 	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000,
 	 0x00000000,0x00000000,0x00000001,0xFFFFFFFF},
@@ -188,14 +173,12 @@ static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
 	{0xFFFFFFFB,0xFFFFFFFF,0xFFFFFFFF,0x00000004,
 	 0x00000000,0x00000000,0x00000005,0xFFFFFFFB},
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_256_sqr[] = {
 	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,
 	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0x00000001,
 	0xFFFFFFFE,0x00000001,0xFFFFFFFE,0x00000001,
 	0x00000001,0xFFFFFFFE,0x00000002,0xFFFFFFFE
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
 	{0xFFFFFFFF,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,
 	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
@@ -208,19 +191,16 @@ static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
 	{0xFFFFFFFB,0x00000004,0x00000000,0xFFFFFFFB,0xFFFFFFFA,0xFFFFFFFF,
 	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_384_sqr[] = {
 	0x00000001,0xFFFFFFFE,0x00000000,0x00000002,0x00000000,0xFFFFFFFE,
 	0x00000000,0x00000002,0x00000001,0x00000000,0x00000000,0x00000000,
 	0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF,
 	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF
 	};
-__fips_constseg
 static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
 	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
 	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
 	0xFFFFFFFF,0x000001FF};
-__fips_constseg
 static const BN_ULONG _nist_p_521_sqr[] = {
 	0x00000001,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,
 	0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,
diff --git a/crypto/bn/bn_prime.h b/crypto/bn/bn_prime.h
index bd04602e4f..51d2194feb 100644
--- a/crypto/bn/bn_prime.h
+++ b/crypto/bn/bn_prime.h
@@ -63,7 +63,6 @@ typedef unsigned short prime_t;
 #define NUMPRIMES 54
 typedef unsigned char prime_t;
 #endif
-__fips_constseg
 static const prime_t primes[NUMPRIMES]=
 	{
 	   2,   3,   5,   7,  11,  13,  17,  19,
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 3e6afc70db..5c84900a2f 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -141,7 +141,6 @@ int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in)
 int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen, 
 			const EVP_CIPHER *cipher, ENGINE *impl)
 	{
-	__fips_constseg
 	static const unsigned char zero_iv[EVP_MAX_BLOCK_LENGTH] = {0};
 	/* All zeros means restart */
 	if (!key && !cipher && !impl && keylen == 0)
diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index de0a528640..b1b52c00f6 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c
@@ -29,7 +29,6 @@
  * crypt() implementations do.  The patch was sent by 
  * Bjorn Gronvall <bg@sics.se>
  */
-__fips_constseg
 static unsigned const char con_salt[128]={
 0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,
 0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,
@@ -49,7 +48,6 @@ static unsigned const char con_salt[128]={
 0x3D,0x3E,0x3F,0x40,0x41,0x42,0x43,0x44,
 };
 
-__fips_constseg
 static unsigned const char cov_2char[64]={
 0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
 0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 25e82ead2a..ce4faf2322 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -68,7 +68,6 @@
 
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)	/* defaults to false */
 
-__fips_constseg
 static const unsigned char odd_parity[256]={
   1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
  16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
@@ -117,7 +116,6 @@ int DES_check_key_parity(const_DES_cblock *key)
  * (and actual cblock values).
  */
 #define NUM_WEAK_KEY	16
-__fips_constseg
 static const DES_cblock weak_keys[NUM_WEAK_KEY]={
 	/* weak keys */
 	{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
@@ -163,7 +161,6 @@ int DES_is_weak_key(const_DES_cblock *key)
 #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
 	(a)=(a)^(t)^(t>>(16-(n))))
 
-__fips_constseg
 static const DES_LONG des_skb[8][64]={
 	{
 	/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
@@ -340,7 +337,6 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
 
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
 	{
-	__fips_constseg
 	static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
 	register DES_LONG c,d,t,s,t2;
 	register const unsigned char *in;
diff --git a/crypto/des/spr.h b/crypto/des/spr.h
index 9be0dce9f6..b91936a5a5 100644
--- a/crypto/des/spr.h
+++ b/crypto/des/spr.h
@@ -56,7 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-__fips_constseg
 OPENSSL_GLOBAL const DES_LONG DES_SPtrans[8][64]={
 {
 /* nibble 0 */
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 9e3e57a828..aae860e194 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -697,7 +697,6 @@ end:
 
 	for (;;)
 		{
-		__fips_constseg
 		static const unsigned char ggen[4] = {0x67,0x67,0x65,0x6e};
 		if (idx >= 0)
 			{
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 83785b92a9..3c26dced06 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -86,7 +86,6 @@ typedef struct {
 } EC_CURVE_DATA;
 
 /* the nist prime curves */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_NIST_PRIME_192 = {
 	{ NID_X9_62_prime_field,20,24,1 },
@@ -113,7 +112,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0xB4,0xD2,0x28,0x31 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+28*6]; }
 	_EC_NIST_PRIME_224 = {
 	{ NID_X9_62_prime_field,20,28,1 },
@@ -140,7 +138,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+28*6]; }
 	  0x13,0xDD,0x29,0x45,0x5C,0x5C,0x2A,0x3D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+48*6]; }
 	_EC_NIST_PRIME_384 = {
 	{ NID_X9_62_prime_field,20,48,1 },
@@ -179,7 +176,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+48*6]; }
 	  0xEC,0xEC,0x19,0x6A,0xCC,0xC5,0x29,0x73 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+66*6]; }
 	_EC_NIST_PRIME_521 = {
 	{ NID_X9_62_prime_field,20,66,1 },
@@ -231,7 +227,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+66*6]; }
 	};
 
 /* the x9.62 prime curves (minus the nist prime curves) */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_X9_62_PRIME_192V2 = {
 	{ NID_X9_62_prime_field,20,24,1 },
@@ -258,7 +253,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0x48,0xD8,0xDD,0x31 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_X9_62_PRIME_192V3 = {
 	{ NID_X9_62_prime_field,20,24,1 },
@@ -285,7 +279,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0xF6,0x40,0xEC,0x13 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_PRIME_239V1 = {
 	{ NID_X9_62_prime_field,20,30,1 },
@@ -317,7 +310,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0x90,0x71,0xFB,0xD1,0x52,0x26,0x88,0x90,0x9D,0x0B }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_PRIME_239V2 = {
 	{ NID_X9_62_prime_field,20,30,1 },
@@ -349,7 +341,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0x77,0xD4,0x14,0xC0,0x38,0x21,0xBC,0x58,0x20,0x63 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_PRIME_239V3 = {
 	{ NID_X9_62_prime_field,20,30,1 },
@@ -382,7 +373,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	};
 
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+32*6]; }
 	_EC_X9_62_PRIME_256V1 = {
 	{ NID_X9_62_prime_field,20,32,1 },
@@ -416,7 +406,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+32*6]; }
 	};
 
 /* the secg prime curves (minus the nist and x9.62 prime curves) */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
 	_EC_SECG_PRIME_112R1 = {
 	{ NID_X9_62_prime_field,20,14,1 },
@@ -437,7 +426,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
 	  0xAC,0x65,0x61,0xC5 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
 	_EC_SECG_PRIME_112R2 = {
 	{ NID_X9_62_prime_field,20,14,4 },
@@ -458,7 +446,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
 	  0x05,0x20,0xD0,0x4B }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
 	_EC_SECG_PRIME_128R1 = {
 	{ NID_X9_62_prime_field,20,16,1 },
@@ -479,7 +466,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
 	  0x0D,0x1B,0x90,0x38,0xA1,0x15 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
 	_EC_SECG_PRIME_128R2 = {
 	{ NID_X9_62_prime_field,20,16,4 },
@@ -500,7 +486,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
 	  0x24,0x72,0x06,0x13,0xB5,0xA3 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	_EC_SECG_PRIME_160K1 = {
 	{ NID_X9_62_prime_field,0,21,1 },
@@ -525,7 +510,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	  0xB3 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	_EC_SECG_PRIME_160R1 = {
 	{ NID_X9_62_prime_field,20,21,1 },
@@ -552,7 +536,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	  0x57 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	_EC_SECG_PRIME_160R2 = {
 	{ NID_X9_62_prime_field,20,21,1 },
@@ -579,7 +562,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	  0x6B }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
 	_EC_SECG_PRIME_192K1 = {
 	{ NID_X9_62_prime_field,0,24,1 },
@@ -604,7 +586,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
 	  0x74,0xDE,0xFD,0x8D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+29*6]; }
 	_EC_SECG_PRIME_224K1 = {
 	{ NID_X9_62_prime_field,0,29,1 },
@@ -629,7 +610,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+29*6]; }
 	  0x84,0xCA,0xF0,0xA9,0x71,0x76,0x9F,0xB1,0xF7 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+32*6]; }
 	_EC_SECG_PRIME_256K1 = {
 	{ NID_X9_62_prime_field,0,32,1 },
@@ -661,7 +641,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+32*6]; }
 	};
 
 /* some wap/wtls curves */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
 	_EC_WTLS_8 = {
 	{ NID_X9_62_prime_field,0,15,1 },
@@ -680,7 +659,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
 	  0x55,0x1A,0xD8,0x37,0xE9 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	_EC_WTLS_9 = {
 	{ NID_X9_62_prime_field,0,21,1 },
@@ -705,7 +683,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	  0x33 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+28*6]; }
 	_EC_WTLS_12 = {
 	{ NID_X9_62_prime_field,0,28,1 },
@@ -733,7 +710,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+28*6]; }
 #ifndef OPENSSL_NO_EC2M
 
 /* characteristic two curves */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
 	_EC_SECG_CHAR2_113R1 = {
 	{ NID_X9_62_characteristic_two_field,20,15,2 },
@@ -754,7 +730,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
 	  0xEC,0x8A,0x39,0xE5,0x6F }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
 	_EC_SECG_CHAR2_113R2 = {
 	{ NID_X9_62_characteristic_two_field,20,15,2 },
@@ -775,7 +750,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
 	  0x9B,0x24,0x96,0xAF,0x93 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
 	_EC_SECG_CHAR2_131R1 = {
 	{ NID_X9_62_characteristic_two_field,20,17,2 },
@@ -796,7 +770,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
 	  0x23,0x95,0x3A,0x94,0x64,0xB5,0x4D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
 	_EC_SECG_CHAR2_131R2 = {
 	{ NID_X9_62_characteristic_two_field,20,17,2 },
@@ -817,7 +790,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
 	  0x54,0xA2,0x33,0x04,0x9B,0xA9,0x8F }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	_EC_NIST_CHAR2_163K = {
 	{ NID_X9_62_characteristic_two_field,0,21,2 },
@@ -842,7 +814,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	  0xEF }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	_EC_SECG_CHAR2_163R1 = {
 	{ NID_X9_62_characteristic_two_field,0,21,2 },
@@ -874,7 +845,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	  0x9B }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	_EC_NIST_CHAR2_163B = {
 	{ NID_X9_62_characteristic_two_field,0,21,2 },
@@ -905,7 +875,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
 	  0x33 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
 	_EC_SECG_CHAR2_193R1 = {
 	{ NID_X9_62_characteristic_two_field,20,25,2 },
@@ -932,7 +901,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
 	  0xCC,0x92,0x0E,0xBA,0x49 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
 	_EC_SECG_CHAR2_193R2 = {
 	{ NID_X9_62_characteristic_two_field,20,25,2 },
@@ -959,7 +927,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
 	  0xCC,0xD4,0xEE,0x99,0xD5 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
 	_EC_NIST_CHAR2_233K = {
 	{ NID_X9_62_characteristic_two_field,0,30,4 },
@@ -989,7 +956,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
 	  0xBC,0xD4,0x6E,0xFB,0x1A,0xD5,0xF1,0x73,0xAB,0xDF }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_NIST_CHAR2_233B = {
 	{ NID_X9_62_characteristic_two_field,20,30,2 },
@@ -1021,7 +987,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0x8A,0x69,0x22,0x03,0x1D,0x26,0x03,0xCF,0xE0,0xD7 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
 	_EC_SECG_CHAR2_239K1 = {
 	{ NID_X9_62_characteristic_two_field,0,30,4 },
@@ -1051,7 +1016,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
 	  0xB6,0xE9,0x1F,0x1C,0x1D,0xA8,0x00,0xE4,0x78,0xA5 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+36*6]; }
 	_EC_NIST_CHAR2_283K = {
 	{ NID_X9_62_characteristic_two_field,0,36,4 },
@@ -1082,7 +1046,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+36*6]; }
 	  0x1E,0x06,0x1E,0x16,0x3C,0x61 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+36*6]; }
 	_EC_NIST_CHAR2_283B = {
 	{ NID_X9_62_characteristic_two_field,20,36,2 },
@@ -1115,7 +1078,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+36*6]; }
 	  0x2A,0x7C,0xEF,0xAD,0xB3,0x07 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+52*6]; }
 	_EC_NIST_CHAR2_409K = {
 	{ NID_X9_62_characteristic_two_field,0,52,4 },
@@ -1158,7 +1120,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+52*6]; }
 	  0x5F,0xCF }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+52*6]; }
 	_EC_NIST_CHAR2_409B = {
 	{ NID_X9_62_characteristic_two_field,20,52,2 },
@@ -1203,7 +1164,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+52*6]; }
 	  0x11,0x73 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+72*6]; }
 	_EC_NIST_CHAR2_571K = {
 	{ NID_X9_62_characteristic_two_field,0,72,4 },
@@ -1258,7 +1218,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+72*6]; }
 	  0x10,0x01 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+72*6]; }
 	_EC_NIST_CHAR2_571B = {
 	{ NID_X9_62_characteristic_two_field,20,72,2 },
@@ -1315,7 +1274,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+72*6]; }
 	  0x4E,0x47 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	_EC_X9_62_CHAR2_163V1 = {
 	{ NID_X9_62_characteristic_two_field,20,21,2 },
@@ -1342,7 +1300,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	  0xC1 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	_EC_X9_62_CHAR2_163V2 = {
 	{ NID_X9_62_characteristic_two_field,20,21,2 },
@@ -1369,7 +1326,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	  0xA7 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	_EC_X9_62_CHAR2_163V3 = {
 	{ NID_X9_62_characteristic_two_field,20,21,2 },
@@ -1396,7 +1352,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
 	  0x09 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+23*6]; }
 	_EC_X9_62_CHAR2_176V1 = {
 	{ NID_X9_62_characteristic_two_field,0,23,0xFF6E },
@@ -1421,7 +1376,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+23*6]; }
 	  0xFE,0x26,0xAD }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_X9_62_CHAR2_191V1 = {
 	{ NID_X9_62_characteristic_two_field,20,24,2 },
@@ -1448,7 +1402,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0x93,0xBB,0xB9,0xA5 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_X9_62_CHAR2_191V2 = {
 	{ NID_X9_62_characteristic_two_field,20,24,4 },
@@ -1475,7 +1428,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0xE0,0x6B,0x81,0x73 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	_EC_X9_62_CHAR2_191V3 = {
 	{ NID_X9_62_characteristic_two_field,20,24,6 },
@@ -1502,7 +1454,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
 	  0x28,0x8A,0x3E,0xA3 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+27*6]; }
 	_EC_X9_62_CHAR2_208W1 = {
 	{ NID_X9_62_characteristic_two_field,0,27,0xFE48 },
@@ -1527,7 +1478,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+27*6]; }
 	  0xBD,0xD5,0x71,0x7E,0x21,0x2F,0x9D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_CHAR2_239V1 = {
 	{ NID_X9_62_characteristic_two_field,20,30,4 },
@@ -1559,7 +1509,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0x49,0x2A,0x49,0x93,0xF1,0xCA,0xD6,0x66,0xE4,0x47 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_CHAR2_239V2 = {
 	{ NID_X9_62_characteristic_two_field,20,30,6 },
@@ -1591,7 +1540,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0x9C,0x31,0xE3,0xFC,0xDF,0x15,0x46,0x24,0x52,0x2D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	_EC_X9_62_CHAR2_239V3 = {
 	{ NID_X9_62_characteristic_two_field,20,30,0xA },
@@ -1623,7 +1571,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
 	  0xDF,0x90,0x3E,0xF9,0x88,0x8B,0x8A,0x0E,0x4C,0xFF }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+35*6]; }
 	_EC_X9_62_CHAR2_272W1 = {
 	{ NID_X9_62_characteristic_two_field,0,35,0xFF06 },
@@ -1654,7 +1601,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+35*6]; }
 	  0x8F,0x1E,0x62,0x95,0x21 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+39*6]; }
 	_EC_X9_62_CHAR2_304W1 = {
 	{ NID_X9_62_characteristic_two_field,0,39,0xFE2E },
@@ -1685,7 +1631,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+39*6]; }
 	  0x61,0xDA,0x68,0x99,0x16,0x44,0x43,0x05,0x1D }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[20+45*6]; }
 	_EC_X9_62_CHAR2_359V1 = {
 	{ NID_X9_62_characteristic_two_field,20,45,0x4C },
@@ -1724,7 +1669,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[20+45*6]; }
 	  0xF4,0x90,0x75,0x8D,0x3B }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+47*6]; }
 	_EC_X9_62_CHAR2_368W1 = {
 	{ NID_X9_62_characteristic_two_field,0,47,0xFF70 },
@@ -1761,7 +1705,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+47*6]; }
 	  0x31,0xE9,0xCF,0xCE,0x5B,0xD9,0x67 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+54*6]; }
 	_EC_X9_62_CHAR2_431R1 = {
 	{ NID_X9_62_characteristic_two_field,0,54,0x2760 },
@@ -1804,7 +1747,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+54*6]; }
 	  0xC1,0xAD,0x4A,0x91 }
 	};
 
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
 	_EC_WTLS_1 = {
 	{ NID_X9_62_characteristic_two_field,0,15,2 },
@@ -1829,7 +1771,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
  * As the group order is not a prime this curve is not suitable
  * for ECDSA.
  */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+20*6]; }
 	_EC_IPSEC_155_ID3 = {
 	{ NID_X9_62_characteristic_two_field,0,20,3 },
@@ -1858,7 +1799,6 @@ static const struct { EC_CURVE_DATA h; unsigned char data[0+20*6]; }
  * As the group order is not a prime this curve is not suitable
  * for ECDSA.
  */
-__fips_constseg
 static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
 	_EC_IPSEC_185_ID4 = {
 	{ NID_X9_62_characteristic_two_field,0,24,2 },
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index 0a182d4229..bef2e9572c 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -70,7 +70,6 @@
 
 #include "ec_lcl.h"
 
-__fips_constseg
 static const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT;
 
 
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 484142aefa..fda6f052d2 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -148,7 +148,6 @@ static void gcm_gmult_8bit(u64 Xi[2], const u128 Htable[256])
 	const u8 *xi = (const u8 *)Xi+15;
 	size_t rem, n = *xi;
 	const union { long one; char little; } is_endian = {1};
-	__fips_constseg
 	static const size_t rem_8bit[256] = {
 		PACK(0x0000), PACK(0x01C2), PACK(0x0384), PACK(0x0246),
 		PACK(0x0708), PACK(0x06CA), PACK(0x048C), PACK(0x054E),
@@ -327,7 +326,6 @@ static void gcm_init_4bit(u128 Htable[16], u64 H[2])
 }
 
 #ifndef GHASH_ASM
-__fips_constseg
 static const size_t rem_4bit[16] = {
 	PACK(0x0000), PACK(0x1C20), PACK(0x3840), PACK(0x2460),
 	PACK(0x7080), PACK(0x6CA0), PACK(0x48C0), PACK(0x54E0),
@@ -463,7 +461,6 @@ static void gcm_ghash_4bit(u64 Xi[2],const u128 Htable[16],
      */ 
     u128 Hshr4[16];	/* Htable shifted right by 4 bits */
     u8   Hshl4[16];	/* Htable shifted left  by 4 bits */
-    __fips_constseg
     static const unsigned short rem_8bit[256] = {
 	0x0000, 0x01C2, 0x0384, 0x0246, 0x0708, 0x06CA, 0x048C, 0x054E,
 	0x0E10, 0x0FD2, 0x0D94, 0x0C56, 0x0918, 0x08DA, 0x0A9C, 0x0B5E,
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index cb540d7c82..e90dbea983 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -71,7 +71,6 @@
 #include <openssl/fips.h>
 #endif
 
-__fips_constseg
 static const unsigned char zeroes[] = {0,0,0,0,0,0,0,0};
 
 #if defined(_MSC_VER) && defined(_ARM_)
diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 63c77eab7f..a98690225f 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -65,7 +65,6 @@
 
 #include <openssl/opensslv.h>
 
-__fips_constseg
 const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT;
 
 /* The implementation is in ../md32_common.h */
diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index dbd5eb759e..dc9d3038ca 100644
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -14,7 +14,6 @@
 #include <openssl/sha.h>
 #include <openssl/opensslv.h>
 
-__fips_constseg
 const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
 
 int SHA224_Init (SHA256_CTX *c)
@@ -116,7 +115,6 @@ void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num);
 #include "md32_common.h"
 
 #ifndef SHA256_ASM
-__fips_constseg
 static const SHA_LONG K256[64] = {
 	0x428a2f98UL,0x71374491UL,0xb5c0fbcfUL,0xe9b5dba5UL,
 	0x3956c25bUL,0x59f111f1UL,0x923f82a4UL,0xab1c5ed5UL,
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index 279999009b..080b33e4dd 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -50,7 +50,6 @@
 
 #include "cryptlib.h"
 
-__fips_constseg
 const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
 
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
@@ -270,7 +269,6 @@ unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md)
 	}
 
 #ifndef SHA512_ASM
-__fips_constseg
 static const SHA_LONG64 K512[80] = {
         U64(0x428a2f98d728ae22),U64(0x7137449123ef65cd),
         U64(0xb5c0fbcfec4d3b2f),U64(0xe9b5dba58189dbbc),
diff --git a/crypto/thr_id.c b/crypto/thr_id.c
index 4267526777..adad72e7d3 100644
--- a/crypto/thr_id.c
+++ b/crypto/thr_id.c
@@ -130,7 +130,6 @@ void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val)
 	id->val = val;
 	}
 
-__fips_constseg
 static const unsigned char hash_coeffs[] = { 3, 5, 7, 11, 13, 17, 19, 23 };
 void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
 	{