diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 97d1c40a66..78a6787d43 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.153 2018/03/17 16:20:01 beck Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.154 2018/03/20 15:28:12 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 | * |
@@ -1317,6 +1317,8 @@ long SSL_SESSION_get_timeout(const SSL_SESSION *s); | |||
1317 | long SSL_SESSION_set_timeout(SSL_SESSION *s, long t); | 1317 | long SSL_SESSION_set_timeout(SSL_SESSION *s, long t); |
1318 | void SSL_copy_session_id(SSL *to, const SSL *from); | 1318 | void SSL_copy_session_id(SSL *to, const SSL *from); |
1319 | X509 *SSL_SESSION_get0_peer(SSL_SESSION *s); | 1319 | X509 *SSL_SESSION_get0_peer(SSL_SESSION *s); |
1320 | int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid, | ||
1321 | unsigned int sid_len); | ||
1320 | int SSL_SESSION_set1_id_context(SSL_SESSION *s, | 1322 | int SSL_SESSION_set1_id_context(SSL_SESSION *s, |
1321 | const unsigned char *sid_ctx, unsigned int sid_ctx_len); | 1323 | const unsigned char *sid_ctx, unsigned int sid_ctx_len); |
1322 | 1324 | ||
@@ -2039,6 +2041,7 @@ void ERR_load_SSL_strings(void); | |||
2039 | #define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273 | 2041 | #define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273 |
2040 | #define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH 303 | 2042 | #define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH 303 |
2041 | #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231 | 2043 | #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231 |
2044 | #define SSL_R_SSL_SESSION_ID_TOO_LONG 408 | ||
2042 | #define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 | 2045 | #define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 |
2043 | #define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050 | 2046 | #define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050 |
2044 | #define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021 | 2047 | #define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021 |