diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-19 00:35:57 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-12-08 13:25:38 +0000 |
| commit | e4e5bc39f9481b9c0842ad5b6d0ac338a9742281 (patch) | |
| tree | 9bd2681c29d54c023f01bfa19ea9a9e8a54c7ae5 /crypto/des | |
| parent | 85129ab5795a4b363d9b8d9a0ffbb3108c69cd8a (diff) | |
Remove fips_constseg references.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/fcrypt.c | 2 | ||||
| -rw-r--r-- | crypto/des/set_key.c | 4 | ||||
| -rw-r--r-- | crypto/des/spr.h | 1 |
3 files changed, 0 insertions, 7 deletions
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 */ |