diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/ssl.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 58493fa988..600f8598fd 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.96 2015/10/25 16:07:04 doug Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.97 2016/11/02 10:52:30 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 | * |
@@ -1318,7 +1318,12 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count); | |||
1318 | #define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id) | 1318 | #define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id) |
1319 | #define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id) | 1319 | #define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id) |
1320 | 1320 | ||
1321 | DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) | 1321 | SSL_SESSION *PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, |
1322 | pem_password_cb *cb, void *u); | ||
1323 | SSL_SESSION *PEM_read_SSL_SESSION(FILE *fp, SSL_SESSION **x, | ||
1324 | pem_password_cb *cb, void *u); | ||
1325 | int PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x); | ||
1326 | int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | ||
1322 | 1327 | ||
1323 | #define SSL_AD_REASON_OFFSET 1000 /* offset to get SSL_R_... value from SSL_AD_... */ | 1328 | #define SSL_AD_REASON_OFFSET 1000 /* offset to get SSL_R_... value from SSL_AD_... */ |
1324 | 1329 | ||