diff options
| author | jsing <> | 2016-09-04 16:11:47 +0000 |
|---|---|---|
| committer | jsing <> | 2016-09-04 16:11:47 +0000 |
| commit | 255f36cd6161a4a0acf9be1147be1341488d11f2 (patch) | |
| tree | 9bd8f608c5016d6312384c406308b49a6af2bac4 /src | |
| parent | 04eb134ce1ed30093ff08d9ef481d7de69068a52 (diff) | |
| download | openbsd-255f36cd6161a4a0acf9be1147be1341488d11f2.tar.gz openbsd-255f36cd6161a4a0acf9be1147be1341488d11f2.tar.bz2 openbsd-255f36cd6161a4a0acf9be1147be1341488d11f2.zip | |
Expand IMPLEMENT_PEM macros.
No change in generated assembly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 16dd5c444c..3748eff2f7 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.49 2016/03/11 07:08:45 mmcc Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.50 2016/09/04 16:11:47 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,4 +1096,31 @@ 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 | IMPLEMENT_PEM_rw(SSL_SESSION, SSL_SESSION, PEM_STRING_SSL_SESSION, SSL_SESSION) | 1099 | |
| 1100 | SSL_SESSION * | ||
| 1101 | PEM_read_bio_SSL_SESSION(BIO *bp, SSL_SESSION **x, pem_password_cb *cb, void *u) | ||
| 1102 | { | ||
| 1103 | return PEM_ASN1_read_bio((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, | ||
| 1104 | (void **)x, cb, u); | ||
| 1105 | } | ||
| 1106 | |||
| 1107 | SSL_SESSION * | ||
| 1108 | PEM_read_SSL_SESSION(FILE *fp, SSL_SESSION **x, pem_password_cb *cb, void *u) | ||
| 1109 | { | ||
| 1110 | return PEM_ASN1_read((d2i_of_void *)d2i_SSL_SESSION, PEM_STRING_SSL_SESSION, fp, | ||
| 1111 | (void **)x, cb, u); | ||
| 1112 | } | ||
| 1113 | |||
| 1114 | int | ||
| 1115 | PEM_write_bio_SSL_SESSION(BIO *bp, SSL_SESSION *x) | ||
| 1116 | { | ||
| 1117 | return PEM_ASN1_write_bio((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, bp, | ||
| 1118 | x, NULL, NULL, 0, NULL, NULL); | ||
| 1119 | } | ||
| 1120 | |||
| 1121 | int | ||
| 1122 | PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x) | ||
| 1123 | { | ||
| 1124 | return PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, fp, | ||
| 1125 | x, NULL, NULL, 0, NULL, NULL); | ||
| 1126 | } | ||