diff options
author | jsing <> | 2016-09-04 16:12:33 +0000 |
---|---|---|
committer | jsing <> | 2016-09-04 16:12:33 +0000 |
commit | c29e0e7bf4ee4f4a903f455070be2bcaec93ff48 (patch) | |
tree | 591ddd28ce7f4122267861faeff1465838eed4f3 /src/lib/libssl/ssl_sess.c | |
parent | 255f36cd6161a4a0acf9be1147be1341488d11f2 (diff) | |
download | openbsd-c29e0e7bf4ee4f4a903f455070be2bcaec93ff48.tar.gz openbsd-c29e0e7bf4ee4f4a903f455070be2bcaec93ff48.tar.bz2 openbsd-c29e0e7bf4ee4f4a903f455070be2bcaec93ff48.zip |
Sort and group functions.
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 3748eff2f7..c2f37b46f2 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.50 2016/09/04 16:11:47 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.51 2016/09/04 16:12:33 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 | * |
@@ -1096,12 +1096,11 @@ SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, | |||
1096 | ctx->app_verify_cookie_cb = cb; | 1096 | ctx->app_verify_cookie_cb = cb; |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | 1099 | int | |
1100 | SSL_SESSION * | 1100 | PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x) |
1101 | PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, pem_password_cb *cb, void *u) | ||
1102 | { | 1101 | { |
1103 | return PEM_ASN1_read_bio((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, | 1102 | return PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, fp, |
1104 | (void **)x, cb, u); | 1103 | x, NULL, NULL, 0, NULL, NULL); |
1105 | } | 1104 | } |
1106 | 1105 | ||
1107 | SSL_SESSION * | 1106 | SSL_SESSION * |
@@ -1111,16 +1110,16 @@ PEM_read_SSL_SESSION(FILE *fp, SSL_SESSION **x, pem_password_cb *cb, void *u) | |||
1111 | (void **)x, cb, u); | 1110 | (void **)x, cb, u); |
1112 | } | 1111 | } |
1113 | 1112 | ||
1114 | int | 1113 | SSL_SESSION * |
1115 | PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x) | 1114 | PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, pem_password_cb *cb, void *u) |
1116 | { | 1115 | { |
1117 | return PEM_ASN1_write_bio((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, | 1116 | return PEM_ASN1_read_bio((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, |
1118 | x, NULL, NULL, 0, NULL, NULL); | 1117 | (void **)x, cb, u); |
1119 | } | 1118 | } |
1120 | 1119 | ||
1121 | int | 1120 | int |
1122 | PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x) | 1121 | PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x) |
1123 | { | 1122 | { |
1124 | return PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, fp, | 1123 | return PEM_ASN1_write_bio((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, |
1125 | x, NULL, NULL, 0, NULL, NULL); | 1124 | x, NULL, NULL, 0, NULL, NULL); |
1126 | } | 1125 | } |