diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/dsa/dsa_vrf.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/dsa/dsa_vrf.c')
| -rw-r--r-- | src/lib/libcrypto/dsa/dsa_vrf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_vrf.c b/src/lib/libcrypto/dsa/dsa_vrf.c index 8ef0c45025..c9784bed48 100644 --- a/src/lib/libcrypto/dsa/dsa_vrf.c +++ b/src/lib/libcrypto/dsa/dsa_vrf.c | |||
| @@ -74,7 +74,8 @@ int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, | |||
| 74 | DSA *dsa) | 74 | DSA *dsa) |
| 75 | { | 75 | { |
| 76 | #ifdef OPENSSL_FIPS | 76 | #ifdef OPENSSL_FIPS |
| 77 | if(FIPS_mode() && !FIPS_dsa_check(dsa)) | 77 | if(FIPS_mode() && !(dsa->flags & DSA_FLAG_FIPS_EXTERNAL_METHOD_ALLOW) |
| 78 | && !FIPS_dsa_check(dsa)) | ||
| 78 | return -1; | 79 | return -1; |
| 79 | #endif | 80 | #endif |
| 80 | return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa); | 81 | return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa); |