summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_sess.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2018-02-17 15:32:20 +0000
committerjsing <jsing@openbsd.org>2018-02-17 15:32:20 +0000
commit29e4fea2b26985a422381919c1d9afa510db271a (patch)
tree970e1cf1085bb657c838355adc5b49d5551b4274 /lib/libssl/ssl_sess.c
parentProvide SSL_get_client_random() and SSL_get_server_random() (diff)
downloadwireguard-openbsd-29e4fea2b26985a422381919c1d9afa510db271a.tar.xz
wireguard-openbsd-29e4fea2b26985a422381919c1d9afa510db271a.zip
Provide SSL_SESSION_get_master_key()
Diffstat (limited to 'lib/libssl/ssl_sess.c')
-rw-r--r--lib/libssl/ssl_sess.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/libssl/ssl_sess.c b/lib/libssl/ssl_sess.c
index 59d7d9ec24f..70c6daa22d7 100644
--- a/lib/libssl/ssl_sess.c
+++ b/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sess.c,v 1.71 2017/04/10 17:27:33 jsing Exp $ */
+/* $OpenBSD: ssl_sess.c,v 1.72 2018/02/17 15:32:20 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -753,6 +753,23 @@ SSL_set_session(SSL *s, SSL_SESSION *session)
return (ret);
}
+size_t
+SSL_SESSION_get_master_key(const SSL_SESSION *ss, unsigned char *out,
+ size_t max_out)
+{
+ size_t len = ss->master_key_length;
+
+ if (out == NULL)
+ return len;
+
+ if (len > max_out)
+ len = max_out;
+
+ memcpy(out, ss->master_key, len);
+
+ return len;
+}
+
long
SSL_SESSION_set_timeout(SSL_SESSION *s, long t)
{