From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 16 Jan 2014 14:06:19 +0000 (+0000)
Subject: Add new function SSL_CTX_get_ssl_method().
X-Git-Tag: master-pre-reformat~947
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba168244a14bbd056e502d7daa04cae4aabe9d0d;p=thirdparty%2Fopenssl.git

Add new function SSL_CTX_get_ssl_method().

Partial fix for PR#3183.
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 3c49a38ab0e..da777e99a5d 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 3c7d54d9d28..d47f26865bf 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);