Add SSL_SESSION_get0_hostname()

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index ef7ef568021aed59985d798cdb814dd361a27c2b..44f44bf7b2ddbedfa5b9ff36b07a10046ab2fe90 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1473,6 +1473,7 @@ __owur long SSL_SESSION_get_time(const SSL_SESSION *s);
 __owur long SSL_SESSION_set_time(SSL_SESSION *s, long t);
 __owur long SSL_SESSION_get_timeout(const SSL_SESSION *s);
 __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
+__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
 __owur int SSL_SESSION_has_ticket(const SSL_SESSION *s);
 __owur unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
 void SSL_SESSION_get0_ticket(const SSL_SESSION *s, unsigned char **tick,

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 70e2683ee447f34c5e4c47c7fc97e76de88f134f..d5b7fe33109325d95c389035645fb75227329311 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -925,6 +925,11 @@ long SSL_SESSION_set_time(SSL_SESSION *s, long t)
     return (t);
 }
 
+const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s)
+{
+    return s->tlsext_hostname;
+}
+
 int SSL_SESSION_has_ticket(const SSL_SESSION *s)
 {
     return (s->tlsext_ticklen > 0) ? 1 : 0;

diff --git a/util/libssl.num b/util/libssl.num
index 781a8cb7e68871659ef11abcd12f3b985e16b238..636892cd8a66e47e5ba9e438093410dbb31711c5 100644 (file)
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -393,3 +393,4 @@ SSL_CTX_get0_ctlog_store                392 1_1_0   EXIST::FUNCTION:CT
 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: