From 6546e9b2210c98da68f5a481ad81ebabad892977 Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Mon, 9 May 2016 12:58:01 +0100 Subject: [PATCH] Add SSL_client_version() getter function Reviewed-by: Rich Salz Reviewed-by: Tim Hudson Reviewed-by: Matt Caswell --- include/openssl/ssl.h | 1 + ssl/ssl_lib.c | 11 ++++++++--- util/libssl.num | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index cf02047d67..b5e2161558 100644 --- 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 14e8c1e4f6..471779b03a 100644 --- 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 636892cd8a..8af95d1e72 100644 --- 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: -- GitLab