diff options
author | jsing <> | 2014-05-31 10:49:28 +0000 |
---|---|---|
committer | jsing <> | 2014-05-31 10:49:28 +0000 |
commit | cc0b160e462358c219bef48df27be2e816b65194 (patch) | |
tree | 32a374445fa15f520b06510f07c011a6234df599 /src/lib/libssl/tls1.h | |
parent | 57e924c96320c9b14de6078fc75984c949b073b2 (diff) | |
download | openbsd-cc0b160e462358c219bef48df27be2e816b65194.tar.gz openbsd-cc0b160e462358c219bef48df27be2e816b65194.tar.bz2 openbsd-cc0b160e462358c219bef48df27be2e816b65194.zip |
TLS would not be entirely functional without extensions, so unifdef
OPENSSL_NO_TLSEXT.
ok tedu@
Diffstat (limited to 'src/lib/libssl/tls1.h')
-rw-r--r-- | src/lib/libssl/tls1.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 400deca6d4..813bc97b31 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
@@ -274,7 +274,6 @@ extern "C" { | |||
274 | #define TLSEXT_hash_sha384 5 | 274 | #define TLSEXT_hash_sha384 5 |
275 | #define TLSEXT_hash_sha512 6 | 275 | #define TLSEXT_hash_sha512 6 |
276 | 276 | ||
277 | #ifndef OPENSSL_NO_TLSEXT | ||
278 | 277 | ||
279 | #define TLSEXT_MAXLEN_host_name 255 | 278 | #define TLSEXT_MAXLEN_host_name 255 |
280 | 279 | ||
@@ -353,7 +352,6 @@ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg) | |||
353 | #define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \ | 352 | #define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \ |
354 | SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | 353 | SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) |
355 | 354 | ||
356 | #endif | ||
357 | 355 | ||
358 | /* PSK ciphersuites from 4279 */ | 356 | /* PSK ciphersuites from 4279 */ |
359 | #define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A | 357 | #define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A |