generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check flag before calling FIPS_dsa_check().

Browse Source
This commit is contained in:
Dr. Stephen Henson
2006-03-31 22:44:20 +00:00
parent 6fa6e3e2df
commit f4e43726a8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/dsa/dsa_sign.c
View File

@@ -72,8 +72,8 @@
DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
{ {
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if(FIPS_mode() && !FIPS_dsa_check(dsa) if(FIPS_mode() && !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
&& !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)) && !FIPS_dsa_check(dsa))
return NULL; return NULL;
#endif #endif
return dsa->meth->dsa_do_sign(dgst, dlen, dsa); return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
@@ -97,8 +97,8 @@ int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
{ {
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if(FIPS_mode() && !FIPS_dsa_check(dsa) if(FIPS_mode() && !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
&& !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)) && !FIPS_dsa_check(dsa))
return 0; return 0;
#endif #endif
return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp); return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);

4
crypto/dsa/dsa_vrf.c
View File

@@ -74,8 +74,8 @@ int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
DSA *dsa) DSA *dsa)
{ {
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if(FIPS_mode() && !FIPS_dsa_check(dsa) if(FIPS_mode() && !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)
&& !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW)) && !FIPS_dsa_check(dsa))
return -1; return -1;
#endif #endif
return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa); return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa);