aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-01-16 14:06:19 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-01-16 14:07:46 +0000
commitba168244a14bbd056e502d7daa04cae4aabe9d0d (patch)
tree16d666b5a854e6f7b807ec82cb7480b46cac4193
parentd0b039d4a3a19b106cc2cb938125b86aca4974aa (diff)
downloadopenssl-ba168244a14bbd056e502d7daa04cae4aabe9d0d.tar.gz
Add new function SSL_CTX_get_ssl_method().
Partial fix for PR#3183.
-rw-r--r--ssl/ssl.h1
-rw-r--r--ssl/ssl_lib.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 3c49a38ab0..da777e99a5 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2357,6 +2357,7 @@ int SSL_renegotiate_abbreviated(SSL *s);
int SSL_renegotiate_pending(SSL *s);
int SSL_shutdown(SSL *s);
+const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
const SSL_METHOD *SSL_get_ssl_method(SSL *s);
int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
const char *SSL_alert_type_string_long(int value);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 3c7d54d9d2..d47f26865b 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2750,6 +2750,11 @@ void ssl_update_cache(SSL *s,int mode)
}
}
+const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx)
+ {
+ return ctx->method;
+ }
+
const SSL_METHOD *SSL_get_ssl_method(SSL *s)
{
return(s->method);