summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls1.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/tls1.h')
-rw-r--r--src/lib/libssl/tls1.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index 7e35f13849..95d6660ac3 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -240,9 +240,9 @@ extern "C" {
240#define TLSEXT_TYPE_session_ticket 35 240#define TLSEXT_TYPE_session_ticket 35
241 241
242/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */ 242/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
243#if 0 /* will have to be provided externally for now , 243#if 0 /* will have to be provided externally for now ,
244 * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183 244 * i.e. build with - DTLSEXT_TYPE_opaque_prf_input = 38183
245 * using whatever extension number you'd like to try */ 245 * using whatever extension number you'd like to try */
246# define TLSEXT_TYPE_opaque_prf_input ?? */ 246# define TLSEXT_TYPE_opaque_prf_input ?? */
247#endif 247#endif
248 248
@@ -295,8 +295,8 @@ int SSL_get_servername_type(const SSL *s);
295 * It returns 1 on success and zero otherwise. 295 * It returns 1 on success and zero otherwise.
296 */ 296 */
297int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, 297int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
298 const char *label, size_t llen, const unsigned char *p, size_t plen, 298 const char *label, size_t llen, const unsigned char *p, size_t plen,
299 int use_context); 299 int use_context);
300 300
301#define SSL_set_tlsext_host_name(s,name) \ 301#define SSL_set_tlsext_host_name(s,name) \
302SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name) 302SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
@@ -719,11 +719,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
719#endif 719#endif
720 720
721/* TLS Session Ticket extension struct */ 721/* TLS Session Ticket extension struct */
722struct tls_session_ticket_ext_st 722struct tls_session_ticket_ext_st {
723 {
724 unsigned short length; 723 unsigned short length;
725 void *data; 724 void *data;
726 }; 725};
727 726
728#ifdef __cplusplus 727#ifdef __cplusplus
729} 728}