summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 2ce4b05600..92667ec125 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.197 2017/10/11 16:51:39 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.198 2017/10/11 17:35:00 jsing 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 *
@@ -1064,9 +1064,8 @@ int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b);
1064SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, int num); 1064SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, int num);
1065int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap, 1065int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap,
1066 const SSL_CIPHER * const *bp); 1066 const SSL_CIPHER * const *bp);
1067int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *ciphers, CBB *cbb);
1067STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, CBS *cbs); 1068STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, CBS *cbs);
1068int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
1069 unsigned char *p, size_t maxlen, size_t *outlen);
1070STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, 1069STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
1071 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted, 1070 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted,
1072 const char *rule_str); 1071 const char *rule_str);
@@ -1286,9 +1285,6 @@ uint16_t tls1_ec_nid2curve_id(const int nid);
1286int tls1_check_curve(SSL *s, const uint16_t curve_id); 1285int tls1_check_curve(SSL *s, const uint16_t curve_id);
1287int tls1_get_shared_curve(SSL *s); 1286int tls1_get_shared_curve(SSL *s);
1288 1287
1289unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p,
1290 unsigned char *limit);
1291
1292int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data, 1288int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
1293 unsigned char *d, int n, int *al); 1289 unsigned char *d, int n, int *al);
1294int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data, 1290int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,