diff options
| author | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
| commit | e393e47b1e23744a7d0ed999afb5d137070f5f8f (patch) | |
| tree | 9739a803477c4610ec6628d914bdcc55fbb3602a /crypto/openssl/crypto/dsa/dsa_vrf.c | |
| parent | a8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff) | |
| parent | 532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff) | |
| download | FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz | |
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/crypto/dsa/dsa_vrf.c')
| -rw-r--r-- | crypto/openssl/crypto/dsa/dsa_vrf.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/crypto/openssl/crypto/dsa/dsa_vrf.c b/crypto/openssl/crypto/dsa/dsa_vrf.c index c75e423..674cb5f 100644 --- a/crypto/openssl/crypto/dsa/dsa_vrf.c +++ b/crypto/openssl/crypto/dsa/dsa_vrf.c @@ -58,26 +58,18 @@ /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ -#include <stdio.h> #include "cryptlib.h" -#include <openssl/bn.h> #include <openssl/dsa.h> -#include <openssl/rand.h> -#include <openssl/asn1.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif - -#include <openssl/asn1_mac.h> int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa) { #ifdef OPENSSL_FIPS - if(FIPS_mode() && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW)) + if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD) + && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW)) { - DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE); - return 0; + DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_NON_FIPS_DSA_METHOD); + return -1; } #endif return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa); |
