OpenSSL: OpenSSL_0_9_7-stable: openssl/crypto/dsa/ dsa_sign.c ds...

  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:  
01-Apr-2006 00:44:20
  Branch: OpenSSL_0_9_7-stable             Handle:
2006033123442000

  Modified files:           (Branch: OpenSSL_0_9_7-stable)
    openssl/crypto/dsa      dsa_sign.c dsa_vrf.c

  Log:
    Check flag before calling FIPS_dsa_check().

  Summary:
    Revision    Changes     Path
    1.10.2.8    +4  -4      openssl/crypto/dsa/dsa_sign.c
    1.10.2.8    +2  -2      openssl/crypto/dsa/dsa_vrf.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/dsa/dsa_sign.c
 
============================================================
================
  $ cvs diff -u -r1.10.2.7 -r1.10.2.8 dsa_sign.c
  --- openssl/crypto/dsa/dsa_sign.c	31 Mar 2006 17:09:46
-0000	1.10.2.7
  +++ openssl/crypto/dsa/dsa_sign.c	31 Mar 2006 22:44:20
-0000	1.10.2.8
   -72,8 +72,8 
   DSA_SIG * DSA_do_sign(const unsigned char *dgst, int
dlen, DSA *dsa)
   	{
   #ifdef OPENSSL_FIPS
  -	if(FIPS_mode() && !FIPS_dsa_check(dsa)
  -		&& !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW))
  +	if(FIPS_mode() && !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
  +		&& !FIPS_dsa_check(dsa))
   		return NULL;
   #endif
   	return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
   -97,8 +97,8 
   int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM
**kinvp, BIGNUM **rp)
   	{
   #ifdef OPENSSL_FIPS
  -	if(FIPS_mode() && !FIPS_dsa_check(dsa)
  -		&& !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW))
  +	if(FIPS_mode() && !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
  +		&& !FIPS_dsa_check(dsa))
   		return 0;
   #endif
   	return dsa->meth->dsa_sign_setup(dsa, ctx_in,
kinvp, rp);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/dsa/dsa_vrf.c
 
============================================================
================
  $ cvs diff -u -r1.10.2.7 -r1.10.2.8 dsa_vrf.c
  --- openssl/crypto/dsa/dsa_vrf.c	31 Mar 2006 17:09:46
-0000	1.10.2.7
  +++ openssl/crypto/dsa/dsa_vrf.c	31 Mar 2006 22:44:20
-0000	1.10.2.8
   -74,8 +74,8 
   		  DSA *dsa)
   	{
   #ifdef OPENSSL_FIPS
  -	if(FIPS_mode() && !FIPS_dsa_check(dsa)
  -		&& !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW))
  +	if(FIPS_mode() && !(dsa->flags &
DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
  +		&& !FIPS_dsa_check(dsa))
   		return -1;
   #endif
   	return dsa->meth->dsa_do_verify(dgst, dgst_len,
sig, dsa);
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org