Add SSL_client_version() getter function

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index cf02047d677abd74bfe24239c0c4887a4af8ff03..b5e2161558ac099b470bb43cfc8bbc5953e5bbd5 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1741,6 +1741,7 @@ __owur int SSL_get_quiet_shutdown(const SSL *ssl);
 void SSL_set_shutdown(SSL *ssl, int mode);
 __owur int SSL_get_shutdown(const SSL *ssl);
 __owur int SSL_version(const SSL *ssl);
+__owur int SSL_client_version(const SSL *s);
 __owur int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
 __owur int SSL_CTX_set_default_verify_dir(SSL_CTX *ctx);
 __owur int SSL_CTX_set_default_verify_file(SSL_CTX *ctx);

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 14e8c1e4f6486a890538061be59014bf8310fc51..471779b03a17d7433a9e596334cfb82db96a577a 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3395,17 +3395,22 @@ void SSL_set_shutdown(SSL *s, int mode)
 
 int SSL_get_shutdown(const SSL *s)
 {
-    return (s->shutdown);
+    return s->shutdown;
 }
 
 int SSL_version(const SSL *s)
 {
-    return (s->version);
+    return s->version;
+}
+
+int SSL_client_version(const SSL *s)
+{
+    return s->client_version;
 }
 
 SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl)
 {
-    return (ssl->ctx);
+    return ssl->ctx;
 }
 
 SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)

diff --git a/util/libssl.num b/util/libssl.num
index 636892cd8a66e47e5ba9e438093410dbb31711c5..8af95d1e72cae44ebffc7458b08e17be12c4e51b 100644 (file)
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -394,3 +394,4 @@ SSL_enable_ct                           393 1_1_0   EXIST::FUNCTION:CT
 SSL_CTX_enable_ct                       394    1_1_0   EXIST::FUNCTION:CT
 SSL_CTX_get_ciphers                     395    1_1_0   EXIST::FUNCTION:
 SSL_SESSION_get0_hostname               396    1_1_0   EXIST::FUNCTION:
+SSL_client_version                      397    1_1_0   EXIST::FUNCTION: