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/libssl/src/apps/gendh.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/libssl/src/apps/gendh.c')
| -rw-r--r-- | lib/libssl/src/apps/gendh.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libssl/src/apps/gendh.c b/lib/libssl/src/apps/gendh.c index 47497864b00..caa7327a100 100644 --- a/lib/libssl/src/apps/gendh.c +++ b/lib/libssl/src/apps/gendh.c @@ -235,4 +235,10 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb) #endif return 1; } +#else /* !OPENSSL_NO_DH */ + +# if PEDANTIC +static void *dummy=&dummy; +# endif + #endif |