diff options
| author |   djm <djm@openbsd.org> | 2009-01-09 12:15:16 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-01-09 12:15:16 +0000 |
| commit | e6841c1d1d9856acd9aadf71969ab5b1833b4658 (patch) | |
| tree | cb630d0763fdc6d2813e41aafd74b22677a9b206 /lib/libssl/src/ssl/ssl_ciph.c | |
| parent | import openssl-0.9.8j (diff) | |
| download | wireguard-openbsd-e6841c1d1d9856acd9aadf71969ab5b1833b4658.tar.xz wireguard-openbsd-e6841c1d1d9856acd9aadf71969ab5b1833b4658.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/src/ssl/ssl_ciph.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 514292a03ed..4116fd12f1a 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -115,7 +115,10 @@ */ #include <stdio.h> #include <openssl/objects.h> +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> +#endif + #include "ssl_locl.h" #define SSL_ENC_DES_IDX 0 |