diff options
| author |   djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
| commit | 40d8aef356a70d0b13395f0805e3044b85d91347 (patch) | |
| tree | 22edbfd34c49ce1b7988794a7a74d65829c13819 /lib/libcrypto/dsa/dsa_key.c | |
| parent | import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@ (diff) | |
| download | wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.tar.xz wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/dsa/dsa_key.c')
| -rw-r--r-- | lib/libcrypto/dsa/dsa_key.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/libcrypto/dsa/dsa_key.c b/lib/libcrypto/dsa/dsa_key.c index ef87c3e6372..30607ca579f 100644 --- a/lib/libcrypto/dsa/dsa_key.c +++ b/lib/libcrypto/dsa/dsa_key.c @@ -64,6 +64,7 @@ #include <openssl/dsa.h> #include <openssl/rand.h> +#ifndef OPENSSL_FIPS int DSA_generate_key(DSA *dsa) { int ok=0; @@ -103,3 +104,4 @@ err: return(ok); } #endif +#endif |