List Info

Thread: OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ CHANGES openssl/app...




OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ CHANGES openssl/app...
country flaguser name
Germany
2007-05-21 07:40:08
  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:  
21-May-2007 14:40:07
  Branch: OpenSSL-fips-0_9_8-stable        Handle:
2007052113400403

  Modified files:           (Branch:
OpenSSL-fips-0_9_8-stable)
    openssl                 CHANGES
    openssl/apps            speed.c
    openssl/crypto/aes      aes_ige.c
    openssl/test            igetest.c

  Log:
    Update from stable branch.

  Summary:
    Revision    Changes     Path
    1.1238.2.65.2.13+57 -0      openssl/CHANGES
    1.126.2.5.2.2+59 -3      openssl/apps/speed.c
    1.1.2.2.2.1 +120 -84    openssl/crypto/aes/aes_ige.c
    1.1.2.2.2.1 +17 -0      openssl/test/igetest.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/CHANGES
 
============================================================
================
  $ cvs diff -u -r1.1238.2.65.2.12 -r1.1238.2.65.2.13
CHANGES
  --- openssl/CHANGES	25 Apr 2007 13:15:47
-0000	1.1238.2.65.2.12
  +++ openssl/CHANGES	21 May 2007 12:40:04
-0000	1.1238.2.65.2.13
   -262,6 +262,63 
   
        [Matthew D Wood (Intel Corp)]
   
  +  *) Squeeze another 10% out of IGE mode when in != out.
  +     [Ben Laurie]
  +
  +  *) AES IGE mode speedup.
  +     [Dean Gaudet (Google)]
  +
  +  *) Add the Korean symmetric 128-bit cipher SEED (see
  +     http
://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp) and
  +     add SEED ciphersuites from RFC 4162:
  +
  +        TLS_RSA_WITH_SEED_CBC_SHA      = 
"SEED-SHA"
  +        TLS_DHE_DSS_WITH_SEED_CBC_SHA  = 
"DHE-DSS-SEED-SHA"
  +        TLS_DHE_RSA_WITH_SEED_CBC_SHA  = 
"DHE-RSA-SEED-SHA"
  +        TLS_DH_anon_WITH_SEED_CBC_SHA  = 
"ADH-SEED-SHA"
  +
  +     To minimize changes between patchlevels in the
OpenSSL 0.9.8
  +     series, SEED remains excluded from compilation
unless OpenSSL
  +     is configured with 'enable-seed'.
  +     [KISA, Bodo Moeller]
  +
  +  *) Mitigate branch prediction attacks, which can be
practical if a
  +     single processor is shared, allowing a spy process
to extract
  +     information.  For detailed background information,
see
  +     http://eprint.iacr.or
g/2007/039 (O. Aciicmez, S. Gueron,
  +     J.-P. Seifert, "New Branch Prediction
Vulnerabilities in OpenSSL
  +     and Necessary Software Countermeasures").  The
core of the change
  +     are new versions BN_div_no_branch() and
  +     BN_mod_inverse_no_branch() of BN_div() and
BN_mod_inverse(),
  +     respectively, which are slower, but avoid the
security-relevant
  +     conditional branches.  These are automatically
called by BN_div()
  +     and BN_mod_inverse() if the flag BN_FLG_CONSTTIME is
set for one
  +     of the input BIGNUMs.  Also, BN_is_bit_set() has
been changed to
  +     remove a conditional branch.
  +
  +     BN_FLG_CONSTTIME is the new name for the previous
  +     BN_FLG_EXP_CONSTTIME flag, since it now affects more
than just
  +     modular exponentiation.  (Since OpenSSL 0.9.7h,
setting this flag
  +     in the exponent causes BN_mod_exp_mont() to use the
alternative
  +     implementation in BN_mod_exp_mont_consttime().)  The
old name
  +     remains as a deprecated alias.
  +
  +     Similary, RSA_FLAG_NO_EXP_CONSTTIME is replaced by a
more general
  +     RSA_FLAG_NO_CONSTTIME flag since the RSA
implementation now uses
  +     constant-time implementations for more than just
exponentiation.
  +     Here too the old name is kept as a deprecated
alias.
  +
  +     BN_BLINDING_new() will now use BN_dup() for the
modulus so that
  +     the BN_BLINDING structure gets an independent copy
of the
  +     modulus.  This means that the previous "BIGNUM
*m" argument to
  +     BN_BLINDING_new() and to BN_BLINDING_create_param()
now
  +     essentially becomes "const BIGNUM *m",
although we can't actually
  +     change this in the header file before 0.9.9.  It
allows
  +     RSA_setup_blinding() to use BN_with_flags() on the
modulus to
  +     enable BN_FLG_CONSTTIME.
  +
  +     [Matthew D Wood (Intel Corp)]
  +
     *) In the SSL/TLS server implementation, be strict
about session ID
        context matching (which matters if an application
uses a single
        external cache for different purposes). 
Previously,
   .
  patch -p0 <<' .'
  Index: openssl/apps/speed.c
 
============================================================
================
  $ cvs diff -u -r1.126.2.5.2.1 -r1.126.2.5.2.2 speed.c
  --- openssl/apps/speed.c	24 Apr 2007 11:30:31
-0000	1.126.2.5.2.1
  +++ openssl/apps/speed.c	21 May 2007 12:40:06
-0000	1.126.2.5.2.2
   -275,7 +275,7 
   static int do_multi(int multi);
   #endif
   
  -#define ALGOR_NUM	25
  +#define ALGOR_NUM	28
   #define SIZE_NUM	5
   #define RSA_NUM		4
   #define DSA_NUM		3
   -289,7 +289,8 
     "rc2 cbc","rc5-32/12
cbc","blowfish cbc","cast cbc",
     "aes-128 cbc","aes-192
cbc","aes-256 cbc",
     "camellia-128 cbc","camellia-192
cbc","camellia-256 cbc",
  - 
"evp","sha256","sha512"};
  +  "evp","sha256","sha512",
  +  "aes-128 ige","aes-192
ige","aes-256 ige"};
   static double results[ALGOR_NUM][SIZE_NUM];
   static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
   static double rsa_results[RSA_NUM][2];
   -617,6 +618,9 
   #define D_EVP		22
   #define D_SHA256	23	
   #define D_SHA512	24
  +#define D_IGE_128_AES   25
  +#define D_IGE_192_AES   26
  +#define D_IGE_256_AES   27
   	double d=0.0;
   	long c[ALGOR_NUM][SIZE_NUM];
   #define	R_DSA_512	0
   -957,7 +961,10 
   			if (strcmp(*argv,"aes-128-cbc") == 0)
doit[D_CBC_128_AES]=1;
   		else	if (strcmp(*argv,"aes-192-cbc") == 0)
doit[D_CBC_192_AES]=1;
   		else	if (strcmp(*argv,"aes-256-cbc") == 0)
doit[D_CBC_256_AES]=1;
  -		else
  +		else    if (strcmp(*argv,"aes-128-ige") == 0)
doit[D_IGE_128_AES]=1;
  +		else	if (strcmp(*argv,"aes-192-ige") == 0)
doit[D_IGE_192_AES]=1;
  +		else	if (strcmp(*argv,"aes-256-ige") == 0)
doit[D_IGE_256_AES]=1;
  +                else
   #endif
   #ifndef OPENSSL_NO_CAMELLIA
   			if (strcmp(*argv,"camellia-128-cbc") == 0)
doit[D_CBC_128_CML]=1;
   -1177,6 +1184,7 
   #endif
   #ifndef OPENSSL_NO_AES
   			BIO_printf(bio_err,"aes-128-cbc aes-192-cbc
aes-256-cbc ");
  +			BIO_printf(bio_err,"aes-128-ige aes-192-ige
aes-256-ige ");
   #endif
   #ifndef OPENSSL_NO_CAMELLIA
   			BIO_printf(bio_err,"n");
   -1395,6 +1403,9 
   	c[D_CBC_256_CML][0]=count;
   	c[D_SHA256][0]=count;
   	c[D_SHA512][0]=count;
  +	c[D_IGE_128_AES][0]=count;
  +	c[D_IGE_192_AES][0]=count;
  +	c[D_IGE_256_AES][0]=count;
   
   	for (i=1; i<SIZE_NUM; i++)
   		{
   -1429,6 +1440,9 
    		c[D_CBC_128_CML][i]=c[D_CBC_128_CML][i-1]*l0/l1;
   		c[D_CBC_192_CML][i]=c[D_CBC_192_CML][i-1]*l0/l1;
   		c[D_CBC_256_CML][i]=c[D_CBC_256_CML][i-1]*l0/l1;
  +		c[D_IGE_128_AES][i]=c[D_IGE_128_AES][i-1]*l0/l1;
  +		c[D_IGE_192_AES][i]=c[D_IGE_192_AES][i-1]*l0/l1;
  +		c[D_IGE_256_AES][i]=c[D_IGE_256_AES][i-1]*l0/l1;
   		}
   #ifndef OPENSSL_NO_RSA
   	rsa_c[R_RSA_512][0]=count/2000;
   -1822,6 +1836,48 
   			}
   		}
   
  +	if (doit[D_IGE_128_AES])
  +		{
  +		for (j=0; j<SIZE_NUM; j++)
  +			{
 
+			print_message(names[D_IGE_128_AES],c[D_IGE_128_AES][j],l
engths[j]);
  +			Time_F(START);
  +			for (count=0,run=1; COND(c[D_IGE_128_AES][j]);
count++)
  +				AES_ige_encrypt(buf,buf2,
  +					(unsigned long)lengths[j],&aes_ks1,
  +					iv,AES_ENCRYPT);
  +			d=Time_F(STOP);
  +			print_result(D_IGE_128_AES,j,count,d);
  +			}
  +		}
  +	if (doit[D_IGE_192_AES])
  +		{
  +		for (j=0; j<SIZE_NUM; j++)
  +			{
 
+			print_message(names[D_IGE_192_AES],c[D_IGE_192_AES][j],l
engths[j]);
  +			Time_F(START);
  +			for (count=0,run=1; COND(c[D_IGE_192_AES][j]);
count++)
  +				AES_ige_encrypt(buf,buf2,
  +					(unsigned long)lengths[j],&aes_ks2,
  +					iv,AES_ENCRYPT);
  +			d=Time_F(STOP);
  +			print_result(D_IGE_192_AES,j,count,d);
  +			}
  +		}
  +	if (doit[D_IGE_256_AES])
  +		{
  +		for (j=0; j<SIZE_NUM; j++)
  +			{
 
+			print_message(names[D_IGE_256_AES],c[D_IGE_256_AES][j],l
engths[j]);
  +			Time_F(START);
  +			for (count=0,run=1; COND(c[D_IGE_256_AES][j]);
count++)
  +				AES_ige_encrypt(buf,buf2,
  +					(unsigned long)lengths[j],&aes_ks3,
  +					iv,AES_ENCRYPT);
  +			d=Time_F(STOP);
  +			print_result(D_IGE_256_AES,j,count,d);
  +			}
  +		}
   #endif
   #ifndef OPENSSL_NO_CAMELLIA
   	if (doit[D_CBC_128_CML])
   .
  patch -p0 <<' .'
  Index: openssl/crypto/aes/aes_ige.c
 
============================================================
================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.2.2.1 aes_ige.c
  --- openssl/crypto/aes/aes_ige.c	31 Aug 2006 20:56:51
-0000	1.1.2.2
  +++ openssl/crypto/aes/aes_ige.c	21 May 2007 12:40:06
-0000	1.1.2.2.2.1
   -54,21 +54,23 
   #include <openssl/aes.h>
   #include "aes_locl.h"
   
  -/*
  -static void hexdump(FILE *f,const char *title,const
unsigned char *s,int l)
  -    {
  -    int n=0;
  -
  -    fprintf(f,"%s",title);
  -    for( ; n < l ; ++n)
  -		{
  -		if((n%16) == 0)
  -			fprintf(f,"n%04x",n);
  -		fprintf(f," %02x",s[n]);
  -		}
  -    fprintf(f,"n");
  -    }
  -*/
  +#define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
  +typedef struct {
  +        unsigned long data[N_WORDS];
  +} aes_block_t;
  +
  +// XXX: probably some better way to do this
  +#if defined(__i386__) || defined(__x86_64__)
  +#define UNALIGNED_MEMOPS_ARE_FAST 1
  +#endif
  +
  +#ifdef UNALIGNED_MEMOPS_ARE_FAST
  +#define load_block(d, s)        (d) = *(const aes_block_t
*)(s)
  +#define store_block(d, s)       *(aes_block_t *)(d) =
(s)
  +#else
  +#define load_block(d, s)        memcpy((d).data, (s),
AES_BLOCK_SIZE)
  +#define store_block(d, s)       memcpy((d), (s).data,
AES_BLOCK_SIZE)
  +#endif
   
   /* N.B. The IV for this mode is _twice_ the block size
*/
   
   -77,68 +79,123 
   					 unsigned char *ivec, const int enc)
   	{
   	unsigned long n;
  -	unsigned long len = length;
  -	unsigned char tmp[AES_BLOCK_SIZE];
  -	unsigned char tmp2[AES_BLOCK_SIZE];
  -	unsigned char prev[AES_BLOCK_SIZE];
  -	const unsigned char *iv = ivec;
  -	const unsigned char *iv2 = ivec + AES_BLOCK_SIZE;
  +	unsigned long len;
   
   	OPENSSL_assert(in && out && key
&& ivec);
   	OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT ==
enc));
   	OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
   
  +	len = length / AES_BLOCK_SIZE;
  +
   	if (AES_ENCRYPT == enc)
   		{
  -		/* XXX: Do a separate case for when in != out (strictly
should
  -		   check for overlap, too) */
  -		while (len >= AES_BLOCK_SIZE)
  +		if (in != out)
   			{
  -			/*			hexdump(stdout, "in", in,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", iv,
AES_BLOCK_SIZE); */
  -			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
  -				out[n] = in[n] ^ iv[n];
  -			/*			hexdump(stdout, "in ^ iv", out,
AES_BLOCK_SIZE); */
  -			AES_encrypt(out, out, key);
  -			/*			hexdump(stdout,"enc", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout,"iv2", iv2,
AES_BLOCK_SIZE); */
  -			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
  -				out[n] ^= iv2[n];
  -			/*			hexdump(stdout,"out", out,
AES_BLOCK_SIZE); */
  -			iv = out;
  -			memcpy(prev, in, AES_BLOCK_SIZE);
  -			iv2 = prev;
  -			len -= AES_BLOCK_SIZE;
  -			in += AES_BLOCK_SIZE;
  -			out += AES_BLOCK_SIZE;
  +			aes_block_t *ivp = (aes_block_t *)ivec;
  +			aes_block_t *iv2p = (aes_block_t *)(ivec +
AES_BLOCK_SIZE);
  +
  +			while (len)
  +				{
  +				aes_block_t *inp = (aes_block_t *)in;
  +				aes_block_t *outp = (aes_block_t *)out;
  +
  +				for(n=0 ; n < N_WORDS; ++n)
  +					outp->data[n] = inp->data[n] ^
ivp->data[n];
  +				AES_encrypt((unsigned char *)outp->data, (unsigned
char *)outp->data, key);
  +				for(n=0 ; n < N_WORDS; ++n)
  +					outp->data[n] ^= iv2p->data[n];
  +				ivp = outp;
  +				iv2p = inp;
  +				--len;
  +				in += AES_BLOCK_SIZE;
  +				out += AES_BLOCK_SIZE;
  +				}
  +			memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
  +			memcpy(ivec + AES_BLOCK_SIZE, iv2p->data,
AES_BLOCK_SIZE);
  +			}
  +		else
  +			{
  +			aes_block_t tmp, tmp2;
  +			aes_block_t iv;
  +			aes_block_t iv2;
  +
  +			load_block(iv, ivec);
  +			load_block(iv2, ivec + AES_BLOCK_SIZE);
  +
  +			while (len)
  +				{
  +				load_block(tmp, in);
  +				for(n=0 ; n < N_WORDS; ++n)
  +					tmp2.data[n] = tmp.data[n] ^ iv.data[n];
  +				AES_encrypt((unsigned char *)tmp2.data, (unsigned
char *)tmp2.data, key);
  +				for(n=0 ; n < N_WORDS; ++n)
  +					tmp2.data[n] ^= iv2.data[n];
  +				store_block(out, tmp2);
  +				iv = tmp2;
  +				iv2 = tmp;
  +				--len;
  +				in += AES_BLOCK_SIZE;
  +				out += AES_BLOCK_SIZE;
  +				}
  +			memcpy(ivec, iv.data, AES_BLOCK_SIZE);
  +			memcpy(ivec + AES_BLOCK_SIZE, iv2.data,
AES_BLOCK_SIZE);
   			}
  -		memcpy(ivec, iv, AES_BLOCK_SIZE);
  -		memcpy(ivec + AES_BLOCK_SIZE, iv2, AES_BLOCK_SIZE);
   		}
   	else
   		{
  -		while (len >= AES_BLOCK_SIZE)
  +		if(in != out)
   			{
  -			memcpy(tmp, in, AES_BLOCK_SIZE);
  -			memcpy(tmp2, in, AES_BLOCK_SIZE);
  -			/*			hexdump(stdout, "in", in,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv2", iv2,
AES_BLOCK_SIZE); */
  -			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
  -				tmp[n] ^= iv2[n];
  -			/*			hexdump(stdout, "in ^ iv2", tmp,
AES_BLOCK_SIZE); */
  -			AES_decrypt(tmp, out, key);
  -			/*			hexdump(stdout, "dec", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", ivec,
AES_BLOCK_SIZE); */
  -			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
  -				out[n] ^= ivec[n];
  -			/*			hexdump(stdout, "out", out,
AES_BLOCK_SIZE); */
  -			memcpy(ivec, tmp2, AES_BLOCK_SIZE);
  -			iv2 = out;
  -			len -= AES_BLOCK_SIZE;
  -			in += AES_BLOCK_SIZE;
  -			out += AES_BLOCK_SIZE;
  +			aes_block_t *ivp = (aes_block_t *)ivec;
  +			aes_block_t *iv2p = (aes_block_t *)(ivec +
AES_BLOCK_SIZE);
  +
  +			while (len)
  +				{
  +				aes_block_t tmp;
  +				aes_block_t *inp = (aes_block_t *)in;
  +				aes_block_t *outp = (aes_block_t *)out;
  +
  +				for(n=0 ; n < N_WORDS; ++n)
  +					tmp.data[n] = inp->data[n] ^ iv2p->data[n];
  +				AES_decrypt((unsigned char *)tmp.data, (unsigned char
*)outp->data, key);
  +				for(n=0 ; n < N_WORDS; ++n)
  +					outp->data[n] ^= ivp->data[n];
  +				ivp = inp;
  +				iv2p = outp;
  +				--len;
  +				in += AES_BLOCK_SIZE;
  +				out += AES_BLOCK_SIZE;
  +				}
  +			memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
  +			memcpy(ivec + AES_BLOCK_SIZE, iv2p->data,
AES_BLOCK_SIZE);
  +			}
  +		else
  +			{
  +			aes_block_t tmp, tmp2;
  +			aes_block_t iv;
  +			aes_block_t iv2;
  +
  +			load_block(iv, ivec);
  +			load_block(iv2, ivec + AES_BLOCK_SIZE);
  +
  +			while (len)
  +				{
  +				load_block(tmp, in);
  +				tmp2 = tmp;
  +				for(n=0 ; n < N_WORDS; ++n)
  +					tmp.data[n] ^= iv2.data[n];
  +				AES_decrypt((unsigned char *)tmp.data, (unsigned char
*)tmp.data, key);
  +				for(n=0 ; n < N_WORDS; ++n)
  +					tmp.data[n] ^= iv.data[n];
  +				store_block(out, tmp);
  +				iv = tmp2;
  +				iv2 = tmp;
  +				--len;
  +				in += AES_BLOCK_SIZE;
  +				out += AES_BLOCK_SIZE;
  +				}
  +			memcpy(ivec, iv.data, AES_BLOCK_SIZE);
  +			memcpy(ivec + AES_BLOCK_SIZE, iv2.data,
AES_BLOCK_SIZE);
   			}
  -		memcpy(ivec + AES_BLOCK_SIZE, iv2, AES_BLOCK_SIZE);
   		}
   	}
   
   -177,17 +234,11 
   		iv2 = ivec + AES_BLOCK_SIZE;
   		while (len >= AES_BLOCK_SIZE)
   			{
  -			/*			hexdump(stdout, "in", in,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", iv,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				out[n] = in[n] ^ iv[n];
  -			/*			hexdump(stdout, "in ^ iv", out,
AES_BLOCK_SIZE); */
   			AES_encrypt(out, out, key);
  -			/*			hexdump(stdout,"enc", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout,"iv2", iv2,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				out[n] ^= iv2[n];
  -			/*			hexdump(stdout,"out", out,
AES_BLOCK_SIZE); */
   			iv = out;
   			memcpy(prev, in, AES_BLOCK_SIZE);
   			iv2 = prev;
   -203,8 +254,6 
   		while(len >= AES_BLOCK_SIZE)
   			{
   			out -= AES_BLOCK_SIZE;
  -			/*			hexdump(stdout, "intermediate", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", iv,
AES_BLOCK_SIZE); */
   			/* XXX: reduce copies by alternating between buffers
*/
   			memcpy(tmp, out, AES_BLOCK_SIZE);
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   -235,17 +284,11 
   			out -= AES_BLOCK_SIZE;
   			memcpy(tmp, in, AES_BLOCK_SIZE);
   			memcpy(tmp2, in, AES_BLOCK_SIZE);
  -			/*			hexdump(stdout, "in", in,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv2", iv2,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				tmp[n] ^= iv2[n];
  -			/*			hexdump(stdout, "in ^ iv2", tmp,
AES_BLOCK_SIZE); */
   			AES_decrypt(tmp, out, key);
  -			/*			hexdump(stdout, "dec", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", iv,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				out[n] ^= iv[n];
  -			/*			hexdump(stdout, "out", out,
AES_BLOCK_SIZE); */
   			memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
   			iv = tmp3;
   			iv2 = out;
   -260,17 +303,11 
   			{
   			memcpy(tmp, out, AES_BLOCK_SIZE);
   			memcpy(tmp2, out, AES_BLOCK_SIZE);
  -			/*			hexdump(stdout, "intermediate", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv2", iv2,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				tmp[n] ^= iv2[n];
  -			/*			hexdump(stdout, "out ^ iv2", tmp,
AES_BLOCK_SIZE); */
   			AES_decrypt(tmp, out, key);
  -			/*			hexdump(stdout, "dec", out,
AES_BLOCK_SIZE); */
  -			/*			hexdump(stdout, "iv", ivec,
AES_BLOCK_SIZE); */
   			for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
   				out[n] ^= iv[n];
  -			/*			hexdump(stdout, "out", out,
AES_BLOCK_SIZE); */
   			memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
   			iv = tmp3;
   			iv2 = out;
   -278,6 +315,5 
   			in += AES_BLOCK_SIZE;
   			out += AES_BLOCK_SIZE;
   			}
  -
   		}
   	}
   .
  patch -p0 <<' .'
  Index: openssl/test/igetest.c
 
============================================================
================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.2.2.1 igetest.c
  --- openssl/test/igetest.c	31 Aug 2006 21:01:41
-0000	1.1.2.2
  +++ openssl/test/igetest.c	21 May 2007 12:40:07
-0000	1.1.2.2.2.1
   -220,6 +220,23 
   
   			++errs;
   			}
  +
  +		// try with in == out
  +		memcpy(iv, v->iv, sizeof iv);
  +		memcpy(buf, v->in, v->length);
  +		AES_ige_encrypt(buf, buf, v->length, &key, iv,
v->encrypt);
  +
  +		if(memcmp(v->out, buf, v->length))
  +			{
  +			printf("IGE test vector %d failed (with in ==
out)n", n);
  +			hexdump(stdout, "key", v->key, sizeof
v->key);
  +			hexdump(stdout, "iv", v->iv, sizeof
v->iv);
  +			hexdump(stdout, "in", v->in,
v->length);
  +			hexdump(stdout, "expected", v->out,
v->length);
  +			hexdump(stdout, "got", buf, v->length);
  +
  +			++errs;
  +			}
   		}
   
   	for(n=0 ; n <
sizeof(bi_ige_test_vectors)/sizeof(bi_ige_test_vectors[0])
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org

[1]

about | contact  Other archives ( Real Estate discussion Medical topics )