summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls1.h
diff options
context:
space:
mode:
authormiod <>2014-06-13 04:29:13 +0000
committermiod <>2014-06-13 04:29:13 +0000
commit9ef9f06708ef4fe615f3485f5d82f3fb919fdf03 (patch)
tree4a096128d8787d1beedaa53fd558a98773de0840 /src/lib/libssl/tls1.h
parentcc594d5ff9b7bb08404d34d62287ee1dfd6b8332 (diff)
downloadopenbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.gz
openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.bz2
openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.zip
Remove support for the `opaque PRF input' extension, which draft has expired
7 years ago and never made it into an RFC. That code wasn't compiled in anyway unless one would define the actual on-the-wire extension id bytes; crank libssl major. With help and enlightenment from Brendan MacDonell.
Diffstat (limited to 'src/lib/libssl/tls1.h')
-rw-r--r--src/lib/libssl/tls1.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index f3341017a7..dbe8979a88 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls1.h,v 1.17 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: tls1.h,v 1.18 2014/06/13 04:29:13 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -342,13 +342,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
342#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \ 342#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
343SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg) 343SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
344 344
345#define SSL_set_tlsext_opaque_prf_input(s, src, len) \
346SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)
347#define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \
348SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)
349#define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
350SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
351
352#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \ 345#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
353SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 346SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
354 347