OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/fips/des/ fips_des_s...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
15-Aug-2007 18:22:34
  Branch: OpenSSL-fips-0_9_8-stable        Handle:
2007081517223400

  Modified files:           (Branch:
OpenSSL-fips-0_9_8-stable)
    openssl/fips/des        fips_des_selftest.c

  Log:
    Remove single DES self test vectors.

  Summary:
    Revision    Changes     Path
    1.1.6.3     +1  -29    
openssl/fips/des/fips_des_selftest.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/fips/des/fips_des_selftest.c
 
============================================================
================
  $ cvs diff -u -r1.1.6.2 -r1.1.6.3 fips_des_selftest.c
  --- openssl/fips/des/fips_des_selftest.c	15 Aug 2007
13:35:35 -0000	1.1.6.2
  +++ openssl/fips/des/fips_des_selftest.c	15 Aug 2007
16:22:34 -0000	1.1.6.3
   -54,24 +54,6 
   #include <openssl/opensslconf.h>
   
   #ifdef OPENSSL_FIPS
  -static struct
  -    {
  -    unsigned char key[8];
  -    unsigned char plaintext[8];
  -    unsigned char ciphertext[8];
  -    } tests[]=
  -	{
  -	{
  -	{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
  -	{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
  -	{ 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7 }
  -	},
  -	{
  -	{ 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 },
  -	{ 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
  -	{ 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4 },
  -	},
  -	};
   
   static struct
       {
   -119,7 +101,7 
   
   void FIPS_corrupt_des()
       {
  -    tests[0].plaintext[0]++;
  +    tests2[0].plaintext[0]++;
       }
   
   int FIPS_selftest_des()
   -127,16 +109,6 
       int n, ret = 0;
       EVP_CIPHER_CTX ctx;
       EVP_CIPHER_CTX_init(&ctx);
  -#if 0
  -    /* Encrypt/decrypt with DES and compare to known
answers */
  -    for(n=0 ; n < 2 ; ++n)
  -	{
  -	if (!fips_cipher_test(&ctx, EVP_des_ecb(),
  -				tests[n].key, NULL,
  -				tests[n].plaintext, tests[n].ciphertext, 8))
  -		goto err;
  -	}
  -#endif
       /* Encrypt/decrypt with 2-key 3DES and compare to
known answers */
       for(n=0 ; n < 2 ; ++n)
   	{
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org