X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=fips%2Fdes%2Ffips_des_selftest.c;h=a014f6f33f30594c613a544613fd5692f1efc7fe;hp=6ce556e2bd8533590a0828757557b9ce83c0e664;hb=45fcfcb99fd1f37c5b5cd3b76b99b5f70e7f518a;hpb=25c6542944821afc0693ca7027c769cc8775e90d

diff --git a/fips/des/fips_des_selftest.c b/fips/des/fips_des_selftest.c
index 6ce556e2bd..a014f6f33f 100644
--- a/fips/des/fips_des_selftest.c
+++ b/fips/des/fips_des_selftest.c
@@ -57,32 +57,12 @@
 
 #ifdef OPENSSL_FIPS
 
-static struct
+__fips_constseg
+static const struct
     {
-    unsigned char key[16];
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests2[]=
-	{
-	{
-	{ 0x7c,0x4f,0x6e,0xf7,0xa2,0x04,0x16,0xec,
-	  0x0b,0x6b,0x7c,0x9e,0x5e,0x19,0xa7,0xc4 },
-	{ 0x06,0xa7,0xd8,0x79,0xaa,0xce,0x69,0xef },
-	{ 0x4c,0x11,0x17,0x55,0xbf,0xc4,0x4e,0xfd }
-	},
-	{
-	{ 0x5d,0x9e,0x01,0xd3,0x25,0xc7,0x3e,0x34,
-	  0x01,0x16,0x7c,0x85,0x23,0xdf,0xe0,0x68 },
-	{ 0x9c,0x50,0x09,0x0f,0x5e,0x7d,0x69,0x7e },
-	{ 0xd2,0x0b,0x18,0xdf,0xd9,0x0d,0x9e,0xff },
-	}
-	};
-
-static struct
-    {
-    unsigned char key[24];
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
+    const unsigned char key[24];
+    const unsigned char plaintext[8];
+    const unsigned char ciphertext[8];
     } tests3[]=
 	{
 	{
@@ -101,11 +81,6 @@ static struct
 	},
 	};
 
-void FIPS_corrupt_des()
-    {
-    tests2[0].plaintext[0]++;
-    }
-
 int FIPS_selftest_des()
     {
     int n, ret = 0;
@@ -115,7 +90,7 @@ int FIPS_selftest_des()
     /* Encrypt/decrypt with 3DES and compare to known answers */
     for(n=0 ; n < 2 ; ++n)
 	{
-	if (!fips_cipher_test(&ctx, EVP_des_ede3_ecb(),
+	if (!fips_cipher_test(FIPS_TEST_CIPHER, &ctx, EVP_des_ede3_ecb(),
 				tests3[n].key, NULL,
 				tests3[n].plaintext, tests3[n].ciphertext, 8))
 		goto err;