diff options
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 26 | ||||
-rw-r--r-- | src/lib/libssl/ssl_local.h | 3 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 9e65095c6c..5cd0e82f89 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.315 2023/11/19 15:51:49 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.316 2023/11/25 12:05:08 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 | * |
@@ -1516,18 +1516,6 @@ SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) | |||
1516 | } | 1516 | } |
1517 | LSSL_ALIAS(SSL_CTX_callback_ctrl); | 1517 | LSSL_ALIAS(SSL_CTX_callback_ctrl); |
1518 | 1518 | ||
1519 | int | ||
1520 | ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b) | ||
1521 | { | ||
1522 | long l; | ||
1523 | |||
1524 | l = a->id - b->id; | ||
1525 | if (l == 0L) | ||
1526 | return (0); | ||
1527 | else | ||
1528 | return ((l > 0) ? 1:-1); | ||
1529 | } | ||
1530 | |||
1531 | STACK_OF(SSL_CIPHER) * | 1519 | STACK_OF(SSL_CIPHER) * |
1532 | SSL_get_ciphers(const SSL *s) | 1520 | SSL_get_ciphers(const SSL *s) |
1533 | { | 1521 | { |
@@ -3652,6 +3640,18 @@ SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy) | |||
3652 | LSSL_ALIAS(SSL_set_quic_use_legacy_codepoint); | 3640 | LSSL_ALIAS(SSL_set_quic_use_legacy_codepoint); |
3653 | 3641 | ||
3654 | static int | 3642 | static int |
3643 | ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b) | ||
3644 | { | ||
3645 | long l; | ||
3646 | |||
3647 | l = a->id - b->id; | ||
3648 | if (l == 0L) | ||
3649 | return (0); | ||
3650 | else | ||
3651 | return ((l > 0) ? 1:-1); | ||
3652 | } | ||
3653 | |||
3654 | static int | ||
3655 | ssl_cipher_id_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_) | 3655 | ssl_cipher_id_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_) |
3656 | { | 3656 | { |
3657 | SSL_CIPHER const *a = a_; | 3657 | SSL_CIPHER const *a = a_; |
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index dd8895f018..a3007eae2c 100644 --- a/src/lib/libssl/ssl_local.h +++ b/src/lib/libssl/ssl_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_local.h,v 1.8 2023/11/19 15:51:49 tb Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.9 2023/11/25 12:05:08 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 | * |
@@ -1304,7 +1304,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int include_ticket); | |||
1304 | int ssl_get_new_session(SSL *s, int session); | 1304 | int ssl_get_new_session(SSL *s, int session); |
1305 | int ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, | 1305 | int ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, |
1306 | int *alert); | 1306 | int *alert); |
1307 | int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b); | ||
1308 | SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, | 1307 | SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, |
1309 | int num); | 1308 | int num); |
1310 | int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *ciphers, CBB *cbb); | 1309 | int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *ciphers, CBB *cbb); |