diff options
| author | jsing <> | 2018-02-17 15:32:20 +0000 |
|---|---|---|
| committer | jsing <> | 2018-02-17 15:32:20 +0000 |
| commit | 590ca7c49ea6dffa11fac4d287e1bc0953d27a0a (patch) | |
| tree | d3f88bdfb6d4d7e0f6ba5beb764fb33b55915694 /src/lib/libssl/ssl_sess.c | |
| parent | dca228d4c7fb5b8c93f28b41cdd3540c4603834c (diff) | |
| download | openbsd-590ca7c49ea6dffa11fac4d287e1bc0953d27a0a.tar.gz openbsd-590ca7c49ea6dffa11fac4d287e1bc0953d27a0a.tar.bz2 openbsd-590ca7c49ea6dffa11fac4d287e1bc0953d27a0a.zip | |
Provide SSL_SESSION_get_master_key()
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 59d7d9ec24..70c6daa22d 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.71 2017/04/10 17:27:33 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.72 2018/02/17 15:32:20 jsing 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 | * |
| @@ -753,6 +753,23 @@ SSL_set_session(SSL *s, SSL_SESSION *session) | |||
| 753 | return (ret); | 753 | return (ret); |
| 754 | } | 754 | } |
| 755 | 755 | ||
| 756 | size_t | ||
| 757 | SSL_SESSION_get_master_key(const SSL_SESSION *ss, unsigned char *out, | ||
| 758 | size_t max_out) | ||
| 759 | { | ||
| 760 | size_t len = ss->master_key_length; | ||
| 761 | |||
| 762 | if (out == NULL) | ||
| 763 | return len; | ||
| 764 | |||
| 765 | if (len > max_out) | ||
| 766 | len = max_out; | ||
| 767 | |||
| 768 | memcpy(out, ss->master_key, len); | ||
| 769 | |||
| 770 | return len; | ||
| 771 | } | ||
| 772 | |||
| 756 | long | 773 | long |
| 757 | SSL_SESSION_set_timeout(SSL_SESSION *s, long t) | 774 | SSL_SESSION_set_timeout(SSL_SESSION *s, long t) |
| 758 | { | 775 | { |
