diff options
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 10 | ||||
-rw-r--r-- | src/lib/libssl/t1_lib.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index f7670693c1..6e4eb403cd 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.419 2022/08/17 18:41:17 tb Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.420 2022/08/17 18:42:13 tb 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 | * |
@@ -1513,10 +1513,10 @@ int tls12_derive_master_secret(SSL *s, uint8_t *premaster_secret, | |||
1513 | int ssl_using_ecc_cipher(SSL *s); | 1513 | int ssl_using_ecc_cipher(SSL *s); |
1514 | int ssl_check_srvr_ecc_cert_and_alg(SSL *s, X509 *x); | 1514 | int ssl_check_srvr_ecc_cert_and_alg(SSL *s, X509 *x); |
1515 | 1515 | ||
1516 | void tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, | 1516 | void tls1_get_formatlist(const SSL *s, int client_formats, |
1517 | size_t *pformatslen); | 1517 | const uint8_t **pformats, size_t *pformatslen); |
1518 | void tls1_get_group_list(SSL *s, int client_groups, const uint16_t **pgroups, | 1518 | void tls1_get_group_list(const SSL *s, int client_groups, |
1519 | size_t *pgroupslen); | 1519 | const uint16_t **pgroups, size_t *pgroupslen); |
1520 | 1520 | ||
1521 | int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, | 1521 | int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, |
1522 | const int *groups, size_t ngroups); | 1522 | const int *groups, size_t ngroups); |
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 5a1749c863..049a55288d 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.193 2022/07/03 08:15:52 tb Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.194 2022/08/17 18:42:13 tb 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 | * |
@@ -395,7 +395,7 @@ tls1_ec_nid2group_id(int nid, uint16_t *out_group_id) | |||
395 | * exists, or the default formats if a custom list has not been specified. | 395 | * exists, or the default formats if a custom list has not been specified. |
396 | */ | 396 | */ |
397 | void | 397 | void |
398 | tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, | 398 | tls1_get_formatlist(const SSL *s, int client_formats, const uint8_t **pformats, |
399 | size_t *pformatslen) | 399 | size_t *pformatslen) |
400 | { | 400 | { |
401 | if (client_formats != 0) { | 401 | if (client_formats != 0) { |
@@ -418,7 +418,7 @@ tls1_get_formatlist(SSL *s, int client_formats, const uint8_t **pformats, | |||
418 | * exists, or the default groups if a custom list has not been specified. | 418 | * exists, or the default groups if a custom list has not been specified. |
419 | */ | 419 | */ |
420 | void | 420 | void |
421 | tls1_get_group_list(SSL *s, int client_groups, const uint16_t **pgroups, | 421 | tls1_get_group_list(const SSL *s, int client_groups, const uint16_t **pgroups, |
422 | size_t *pgroupslen) | 422 | size_t *pgroupslen) |
423 | { | 423 | { |
424 | if (client_groups != 0) { | 424 | if (client_groups != 0) { |