summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_locl.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index b11bb4ac61..95858339ea 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.218 2018/11/05 06:55:37 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.219 2018/11/05 20:41:30 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 *
@@ -1257,14 +1257,19 @@ int ssl_ok(SSL *s);
1257int ssl_using_ecc_cipher(SSL *s); 1257int ssl_using_ecc_cipher(SSL *s);
1258int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); 1258int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
1259 1259
1260void tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats,
1261 size_t *pformatslen);
1262void tls1_get_group_list(SSL *s, int client_groups, const uint16_t **pgroups,
1263 size_t *pgroupslen);
1264
1260int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, 1265int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len,
1261 const int *groups, size_t ngroups); 1266 const int *groups, size_t ngroups);
1262int tls1_set_groups_list(uint16_t **out_group_ids, size_t *out_group_ids_len, 1267int tls1_set_group_list(uint16_t **out_group_ids, size_t *out_group_ids_len,
1263 const char *groups); 1268 const char *groups);
1264 1269
1265int tls1_ec_curve_id2nid(const uint16_t curve_id); 1270int tls1_ec_curve_id2nid(const uint16_t curve_id);
1266uint16_t tls1_ec_nid2curve_id(const int nid); 1271uint16_t tls1_ec_nid2curve_id(const int nid);
1267int tls1_check_curve(SSL *s, const uint16_t curve_id); 1272int tls1_check_curve(SSL *s, const uint16_t group_id);
1268int tls1_get_shared_curve(SSL *s); 1273int tls1_get_shared_curve(SSL *s);
1269 1274
1270int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data, 1275int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
@@ -1314,11 +1319,6 @@ int SSL_state_func_code(int _state);
1314#define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),__FILE__,__LINE__) 1319#define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),__FILE__,__LINE__)
1315void SSL_error_internal(const SSL *s, int r, char *f, int l); 1320void SSL_error_internal(const SSL *s, int r, char *f, int l);
1316 1321
1317void tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats,
1318 size_t *pformatslen);
1319void tls1_get_curvelist(SSL *s, int client_curves, const uint16_t **pcurves,
1320 size_t *pcurveslen);
1321
1322#ifndef OPENSSL_NO_SRTP 1322#ifndef OPENSSL_NO_SRTP
1323 1323
1324int srtp_find_profile_by_name(char *profile_name, 1324int srtp_find_profile_by_name(char *profile_name,