diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-08-17 18:42:14 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-08-17 18:42:14 +0000 |
| commit | 0dfa219ad3b02f1cf4249dcb7d184091c2b5f473 (patch) | |
| tree | d75e3540ceea0a7008e52e91bd895064197c980a /lib/libssl | |
| parent | 40c2aba08d729656b70937a941fe3a8ea9c0ba10 (diff) | |
Make tls1_get_{format,group_}list() take a const SSL
ok jsing
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 10 | ||||
| -rw-r--r-- | lib/libssl/t1_lib.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index f7670693c16..6e4eb403cda 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.419 2022/08/17 18:41:17 tb Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.420 2022/08/17 18:42:13 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1513,10 +1513,10 @@ int tls12_derive_master_secret(SSL *s, uint8_t *premaster_secret, int ssl_using_ecc_cipher(SSL *s); int ssl_check_srvr_ecc_cert_and_alg(SSL *s, X509 *x); -void tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, - size_t *pformatslen); -void tls1_get_group_list(SSL *s, int client_groups, const uint16_t **pgroups, - size_t *pgroupslen); +void tls1_get_formatlist(const SSL *s, int client_formats, + const uint8_t **pformats, size_t *pformatslen); +void tls1_get_group_list(const SSL *s, int client_groups, + const uint16_t **pgroups, size_t *pgroupslen); int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, const int *groups, size_t ngroups); diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c index 5a1749c8636..049a55288d1 100644 --- a/lib/libssl/t1_lib.c +++ b/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.193 2022/07/03 08:15:52 tb Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.194 2022/08/17 18:42:13 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -395,7 +395,7 @@ tls1_ec_nid2group_id(int nid, uint16_t *out_group_id) * exists, or the default formats if a custom list has not been specified. */ void -tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, +tls1_get_formatlist(const SSL *s, int client_formats, const uint8_t **pformats, size_t *pformatslen) { if (client_formats != 0) { @@ -418,7 +418,7 @@ tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, * exists, or the default groups if a custom list has not been specified. */ void -tls1_get_group_list(SSL *s, int client_groups, const uint16_t **pgroups, +tls1_get_group_list(const SSL *s, int client_groups, const uint16_t **pgroups, size_t *pgroupslen) { if (client_groups != 0) { |