summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/Symbols.list1
-rw-r--r--src/lib/libssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl_sess.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index b20f29a328..ed7f9f6e64 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -135,6 +135,7 @@ SSL_SESSION_get_ex_data
135SSL_SESSION_get_ex_new_index 135SSL_SESSION_get_ex_new_index
136SSL_SESSION_get_id 136SSL_SESSION_get_id
137SSL_SESSION_get_master_key 137SSL_SESSION_get_master_key
138SSL_SESSION_get_protocol_version
138SSL_SESSION_get_time 139SSL_SESSION_get_time
139SSL_SESSION_get_timeout 140SSL_SESSION_get_timeout
140SSL_SESSION_new 141SSL_SESSION_new
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 1b7a3fbeba..47c90fb39d 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.140 2018/02/17 15:32:20 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.141 2018/02/20 18:07:11 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1279,6 +1279,7 @@ const char *SSL_state_string_long(const SSL *s);
1279const char *SSL_rstate_string_long(const SSL *s); 1279const char *SSL_rstate_string_long(const SSL *s);
1280size_t SSL_SESSION_get_master_key(const SSL_SESSION *ss, 1280size_t SSL_SESSION_get_master_key(const SSL_SESSION *ss,
1281 unsigned char *out, size_t max_out); 1281 unsigned char *out, size_t max_out);
1282int SSL_SESSION_get_protocol_version(SSL_SESSION *s);
1282long SSL_SESSION_get_time(const SSL_SESSION *s); 1283long SSL_SESSION_get_time(const SSL_SESSION *s);
1283long SSL_SESSION_set_time(SSL_SESSION *s, long t); 1284long SSL_SESSION_set_time(SSL_SESSION *s, long t);
1284long SSL_SESSION_get_timeout(const SSL_SESSION *s); 1285long SSL_SESSION_get_timeout(const SSL_SESSION *s);
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 70c6daa22d..54e39183f5 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_sess.c,v 1.72 2018/02/17 15:32:20 jsing Exp $ */ 1/* $OpenBSD: ssl_sess.c,v 1.73 2018/02/20 18:07:11 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -806,6 +806,12 @@ SSL_SESSION_set_time(SSL_SESSION *s, long t)
806 return (t); 806 return (t);
807} 807}
808 808
809int
810SSL_SESSION_get_protocol_version(SSL_SESSION *s)
811{
812 return s->ssl_version;
813}
814
809X509 * 815X509 *
810SSL_SESSION_get0_peer(SSL_SESSION *s) 816SSL_SESSION_get0_peer(SSL_SESSION *s)
811{ 817{