OpenSSL: OpenSSL_0_9_8-stable: openssl/crypto/dsa/ dsa_gen.c

  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:  
05-Oct-2007 18:47:04
  Branch: OpenSSL_0_9_8-stable             Handle:
2007100517470400

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/crypto/dsa      dsa_gen.c

  Log:
    Fix from fips branch.

  Summary:
    Revision    Changes     Path
    1.25.2.1    +9  -2      openssl/crypto/dsa/dsa_gen.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/dsa/dsa_gen.c
 
============================================================
================
  $ cvs diff -u -r1.25 -r1.25.2.1 dsa_gen.c
  --- openssl/crypto/dsa/dsa_gen.c	28 Mar 2005 15:06:29
-0000	1.25
  +++ openssl/crypto/dsa/dsa_gen.c	5 Oct 2007 16:47:04
-0000	1.25.2.1
   -117,13 +117,20 
   	if (bits < 512) bits=512;
   	bits=(bits+63)/64*64;
   
  -	if (seed_len < 20)
  +	/* NB: seed_len == 0 is special case: copy generated
seed to
  + 	 * seed_in if it is not NULL.
  + 	 */
  +	if (seed_len && (seed_len < 20))
   		seed_in = NULL; /* seed buffer too small -- ignore */
   	if (seed_len > 20) 
   		seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows
larger SEED,
   		                * but our internal buffers are
restricted to 160 bits*/
   	if ((seed_in != NULL) && (seed_len == 20))
  +		{
   		memcpy(seed,seed_in,seed_len);
  +		/* set seed_in to NULL to avoid it being copied back
*/
  +		seed_in = NULL;
  +		}
   
   	if ((ctx=BN_CTX_new()) == NULL) goto err;
   
   -300,7 +307,7 
   			ok=0;
   			goto err;
   			}
  -		if ((m > 1) && (seed_in != NULL))
memcpy(seed_in,seed,20);
  +		if (seed_in != NULL) memcpy(seed_in,seed,20);
   		if (counter_ret != NULL) *counter_ret=counter;
   		if (h_ret != NULL) *h_ret=h;
   		}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org