diff options
| author |   djm <djm@openbsd.org> | 2012-10-13 21:25:05 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-10-13 21:25:05 +0000 |
| commit | 5cdd308e23c573f20580c33373ebbd6aaf46ca93 (patch) | |
| tree | 8c9c6577606b3e2a4f852b80db635caddf559533 /lib/libssl/ssl2.h | |
| parent | import OpenSSL-1.0.1c (diff) | |
| download | wireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.tar.xz wireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/ssl2.h')
| -rw-r--r-- | lib/libssl/ssl2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libssl/ssl2.h b/lib/libssl/ssl2.h index 99a52ea0dd9..eb25dcb0bf5 100644 --- a/lib/libssl/ssl2.h +++ b/lib/libssl/ssl2.h @@ -155,6 +155,8 @@ extern "C" { #define CERT char #endif +#ifndef OPENSSL_NO_SSL_INTERN + typedef struct ssl2_state_st { int three_byte_header; @@ -219,6 +221,8 @@ typedef struct ssl2_state_st } tmp; } SSL2_STATE; +#endif + /* SSLv2 */ /* client */ #define SSL2_ST_SEND_CLIENT_HELLO_A (0x10|SSL_ST_CONNECT) |