summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/Symbols.list1
-rw-r--r--src/lib/libssl/ssl.h4
-rw-r--r--src/lib/libssl/ssl_lib.c8
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index 871af0ca92..41ccd7fe9c 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -86,6 +86,7 @@ SSL_CTX_get_info_callback
86SSL_CTX_get_max_proto_version 86SSL_CTX_get_max_proto_version
87SSL_CTX_get_min_proto_version 87SSL_CTX_get_min_proto_version
88SSL_CTX_get_quiet_shutdown 88SSL_CTX_get_quiet_shutdown
89SSL_CTX_get_ssl_method
89SSL_CTX_get_timeout 90SSL_CTX_get_timeout
90SSL_CTX_get_verify_callback 91SSL_CTX_get_verify_callback
91SSL_CTX_get_verify_depth 92SSL_CTX_get_verify_depth
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 02f37fb0d0..2ac2bcbb54 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.187 2021/05/10 17:03:57 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.188 2021/05/10 17:05:26 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 *
@@ -1218,6 +1218,8 @@ int SSL_get_max_proto_version(SSL *ssl);
1218int SSL_set_min_proto_version(SSL *ssl, uint16_t version); 1218int SSL_set_min_proto_version(SSL *ssl, uint16_t version);
1219int SSL_set_max_proto_version(SSL *ssl, uint16_t version); 1219int SSL_set_max_proto_version(SSL *ssl, uint16_t version);
1220 1220
1221const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx);
1222
1221#ifndef LIBRESSL_INTERNAL 1223#ifndef LIBRESSL_INTERNAL
1222#define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS 1224#define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS
1223#define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST 1225#define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 44cc1ed323..2e3be8b13f 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.255 2021/03/29 16:57:38 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.256 2021/05/10 17:05:26 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 *
@@ -3058,6 +3058,12 @@ SSL_set_max_proto_version(SSL *ssl, uint16_t version)
3058 &ssl->internal->max_proto_version); 3058 &ssl->internal->max_proto_version);
3059} 3059}
3060 3060
3061const SSL_METHOD *
3062SSL_CTX_get_ssl_method(const SSL_CTX *ctx)
3063{
3064 return ctx->method;
3065}
3066
3061static int 3067static int
3062ssl_cipher_id_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_) 3068ssl_cipher_id_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)
3063{ 3069{