diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
| commit | 0758ab5ea778e4ba36d2150af1bba602a48d6467 (patch) | |
| tree | 0c30591ac90cb5e07a0763793709fd1056b67f57 /crypto/dsa/dsa_key.c | |
| parent | 2b8b5455829304396e38200c205612c4dc57c052 (diff) | |
Diffstat (limited to 'crypto/dsa/dsa_key.c')
| -rw-r--r-- | crypto/dsa/dsa_key.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c index 5e3912423014c..9cf669b921ac6 100644 --- a/crypto/dsa/dsa_key.c +++ b/crypto/dsa/dsa_key.c @@ -64,14 +64,28 @@ #include <openssl/dsa.h> #include <openssl/rand.h> -#ifndef OPENSSL_FIPS +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif static int dsa_builtin_keygen(DSA *dsa); int DSA_generate_key(DSA *dsa) { +#ifdef OPENSSL_FIPS + if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD) + && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW)) + { + DSAerr(DSA_F_DSA_GENERATE_KEY, DSA_R_NON_FIPS_DSA_METHOD); + return 0; + } +#endif if(dsa->meth->dsa_keygen) return dsa->meth->dsa_keygen(dsa); +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return FIPS_dsa_generate_key(dsa); +#endif return dsa_builtin_keygen(dsa); } @@ -128,5 +142,3 @@ err: return(ok); } #endif - -#endif |