Commit f4e43726 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Check flag before calling FIPS_dsa_check().

parent 6fa6e3e2

crypto/dsa/dsa_sign.c

+4 −4
Original line number Diff line number Diff line
@@ -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(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)

	{

#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);

crypto/dsa/dsa_vrf.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, 
		  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);