summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2016-09-04 16:12:34 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2016-09-04 16:12:34 +0000
commit9d92c579ae5a08ed275dd1d92ce7a553af5769ab (patch)
treec6264b4bc3a679c48b890871f1b1d991b90e5586 /lib
parent1fcbbfb75baa512b3d8deaedb27e085d245536b9 (diff)
Sort and group functions.
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/ssl_sess.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/libssl/ssl_sess.c b/lib/libssl/ssl_sess.c
index 3748eff2f78..c2f37b46f29 100644
--- a/lib/libssl/ssl_sess.c
+++ b/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sess.c,v 1.50 2016/09/04 16:11:47 jsing Exp $ */
+/* $OpenBSD: ssl_sess.c,v 1.51 2016/09/04 16:12:33 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1096,12 +1096,11 @@ SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
ctx->app_verify_cookie_cb = cb;
}
-
-SSL_SESSION *
-PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, pem_password_cb *cb, void *u)
+int
+PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x)
{
- return PEM_ASN1_read_bio((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, bp,
- (void **)x, cb, u);
+ return PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, fp,
+ x, NULL, NULL, 0, NULL, NULL);
}
SSL_SESSION *
@@ -1111,16 +1110,16 @@ PEM_read_SSL_SESSION(FILE *fp, SSL_SESSION **x, pem_password_cb *cb, void *u)
(void **)x, cb, u);
}
-int
-PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x)
+SSL_SESSION *
+PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, pem_password_cb *cb, void *u)
{
- return PEM_ASN1_write_bio((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, bp,
- x, NULL, NULL, 0, NULL, NULL);
+ return PEM_ASN1_read_bio((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, bp,
+ (void **)x, cb, u);
}
int
-PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x)
+PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x)
{
- return PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, fp,
+ return PEM_ASN1_write_bio((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, bp,
x, NULL, NULL, 0, NULL, NULL);
}