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.h | |
| 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.h')
| -rw-r--r-- | src/lib/libssl/ssl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 692bd1a395..1b7a3fbeba 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.139 2018/02/17 15:19:43 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.140 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 | * |
| @@ -1277,6 +1277,8 @@ const char *SSL_state_string(const SSL *s); | |||
| 1277 | const char *SSL_rstate_string(const SSL *s); | 1277 | const char *SSL_rstate_string(const SSL *s); |
| 1278 | const char *SSL_state_string_long(const SSL *s); | 1278 | 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, | ||
| 1281 | unsigned char *out, size_t max_out); | ||
| 1280 | long SSL_SESSION_get_time(const SSL_SESSION *s); | 1282 | long SSL_SESSION_get_time(const SSL_SESSION *s); |
| 1281 | long SSL_SESSION_set_time(SSL_SESSION *s, long t); | 1283 | long SSL_SESSION_set_time(SSL_SESSION *s, long t); |
| 1282 | long SSL_SESSION_get_timeout(const SSL_SESSION *s); | 1284 | long SSL_SESSION_get_timeout(const SSL_SESSION *s); |
