From c29e0e7bf4ee4f4a903f455070be2bcaec93ff48 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sun, 4 Sep 2016 16:12:33 +0000 Subject: Sort and group functions. --- src/lib/libssl/ssl_sess.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/lib/libssl') 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 @@ -/* $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); } -- cgit v1.2.3-55-g6feb