diff options
author | tb <> | 2018-02-20 18:07:11 +0000 |
---|---|---|
committer | tb <> | 2018-02-20 18:07:11 +0000 |
commit | 06776e7c6ac114fb3e9f286d1d6c12d2869543ac (patch) | |
tree | 87af023f864ad18eba255a4d3e0bf9c341c26db1 /src | |
parent | 9d17df01c5dd3ba327b7cd95fb5de819941ff77a (diff) | |
download | openbsd-06776e7c6ac114fb3e9f286d1d6c12d2869543ac.tar.gz openbsd-06776e7c6ac114fb3e9f286d1d6c12d2869543ac.tar.bz2 openbsd-06776e7c6ac114fb3e9f286d1d6c12d2869543ac.zip |
Provide SSL_SESSION_get_protocol_version()
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libssl/ssl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 8 |
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 | |||
135 | SSL_SESSION_get_ex_new_index | 135 | SSL_SESSION_get_ex_new_index |
136 | SSL_SESSION_get_id | 136 | SSL_SESSION_get_id |
137 | SSL_SESSION_get_master_key | 137 | SSL_SESSION_get_master_key |
138 | SSL_SESSION_get_protocol_version | ||
138 | SSL_SESSION_get_time | 139 | SSL_SESSION_get_time |
139 | SSL_SESSION_get_timeout | 140 | SSL_SESSION_get_timeout |
140 | SSL_SESSION_new | 141 | SSL_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); | |||
1279 | const char *SSL_rstate_string_long(const SSL *s); | 1279 | const char *SSL_rstate_string_long(const SSL *s); |
1280 | size_t SSL_SESSION_get_master_key(const SSL_SESSION *ss, | 1280 | size_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); |
1282 | int SSL_SESSION_get_protocol_version(SSL_SESSION *s); | ||
1282 | long SSL_SESSION_get_time(const SSL_SESSION *s); | 1283 | long SSL_SESSION_get_time(const SSL_SESSION *s); |
1283 | long SSL_SESSION_set_time(SSL_SESSION *s, long t); | 1284 | long SSL_SESSION_set_time(SSL_SESSION *s, long t); |
1284 | long SSL_SESSION_get_timeout(const SSL_SESSION *s); | 1285 | long 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 | ||
809 | int | ||
810 | SSL_SESSION_get_protocol_version(SSL_SESSION *s) | ||
811 | { | ||
812 | return s->ssl_version; | ||
813 | } | ||
814 | |||
809 | X509 * | 815 | X509 * |
810 | SSL_SESSION_get0_peer(SSL_SESSION *s) | 816 | SSL_SESSION_get0_peer(SSL_SESSION *s) |
811 | { | 817 | { |