diff options
| author |   djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
| commit | c32db552feb5310e2f4b27f02d313cfbf0b82a8a (patch) | |
| tree | b7b6074be11e20dcb5106c8a27f96bcb3fcdf5c2 /lib/libssl/src/apps/gendh.c | |
| parent | import OpenSSL 1.0.0e (diff) | |
| download | wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.tar.xz wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libssl/src/apps/gendh.c')
| -rw-r--r-- | lib/libssl/src/apps/gendh.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libssl/src/apps/gendh.c b/lib/libssl/src/apps/gendh.c index caa7327a100..4ec776ba939 100644 --- a/lib/libssl/src/apps/gendh.c +++ b/lib/libssl/src/apps/gendh.c @@ -89,9 +89,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { BN_GENCB cb; -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int ret=1,num=DEFBITS; int g=2; @@ -163,7 +160,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif out=BIO_new(BIO_s_file()); |