diff options
| author |   djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
| commit | 0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch) | |
| tree | 9173c770f38c55515569708729da7e02172d3f3d /lib/libcrypto/dh/dh_key.c | |
| parent | import OpenSSL-1.0.0a (diff) | |
| download | wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/dh/dh_key.c')
| -rw-r--r-- | lib/libcrypto/dh/dh_key.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libcrypto/dh/dh_key.c b/lib/libcrypto/dh/dh_key.c index 79dd3318634..e7db440342f 100644 --- a/lib/libcrypto/dh/dh_key.c +++ b/lib/libcrypto/dh/dh_key.c @@ -62,8 +62,6 @@ #include <openssl/rand.h> #include <openssl/dh.h> -#ifndef OPENSSL_FIPS - static int generate_key(DH *dh); static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh); static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, @@ -263,5 +261,3 @@ static int dh_finish(DH *dh) BN_MONT_CTX_free(dh->method_mont_p); return(1); } - -#endif |