diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libssl/ssl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list index 15d43f891e..871af0ca92 100644 --- a/src/lib/libssl/Symbols.list +++ b/src/lib/libssl/Symbols.list | |||
@@ -45,6 +45,7 @@ ERR_load_SSL_strings | |||
45 | 45 | ||
46 | /* general API */ | 46 | /* general API */ |
47 | SSL_CIPHER_description | 47 | SSL_CIPHER_description |
48 | SSL_CIPHER_find | ||
48 | SSL_CIPHER_get_auth_nid | 49 | SSL_CIPHER_get_auth_nid |
49 | SSL_CIPHER_get_bits | 50 | SSL_CIPHER_get_bits |
50 | SSL_CIPHER_get_by_id | 51 | SSL_CIPHER_get_by_id |
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 5ed2198b38..02f37fb0d0 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.186 2021/03/31 16:59:32 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.187 2021/05/10 17:03:57 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 | * |
@@ -1313,6 +1313,7 @@ const char * SSL_CIPHER_get_version(const SSL_CIPHER *c); | |||
1313 | const char * SSL_CIPHER_get_name(const SSL_CIPHER *c); | 1313 | const char * SSL_CIPHER_get_name(const SSL_CIPHER *c); |
1314 | unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c); | 1314 | unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c); |
1315 | uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c); | 1315 | uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c); |
1316 | const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); | ||
1316 | int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c); | 1317 | int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c); |
1317 | int SSL_CIPHER_get_digest_nid(const SSL_CIPHER *c); | 1318 | int SSL_CIPHER_get_digest_nid(const SSL_CIPHER *c); |
1318 | int SSL_CIPHER_get_kx_nid(const SSL_CIPHER *c); | 1319 | int SSL_CIPHER_get_kx_nid(const SSL_CIPHER *c); |
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index ee627a8c1e..2db531abb1 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.121 2021/03/24 18:44:00 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.122 2021/05/10 17:03:57 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 | * |
@@ -1599,6 +1599,12 @@ SSL_CIPHER_get_value(const SSL_CIPHER *c) | |||
1599 | return ssl3_cipher_get_value(c); | 1599 | return ssl3_cipher_get_value(c); |
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | const SSL_CIPHER * | ||
1603 | SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr) | ||
1604 | { | ||
1605 | return ssl->method->get_cipher_by_char(ptr); | ||
1606 | } | ||
1607 | |||
1602 | int | 1608 | int |
1603 | SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c) | 1609 | SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c) |
1604 | { | 1610 | { |