diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-26 14:25:59 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-26 14:25:59 +0000 |
| commit | 6d827f6b727756a9e2fef97fb38775100e9541eb (patch) | |
| tree | 29fb5a11a6e22c9390192468e81140f23c04cccf /lib | |
| parent | a16758e8e3c190d51ad7dd65447189ae5e21e5b5 (diff) | |
Move BIO_new_PKCS7() to the the other streaming stuff in pk7_mime.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/pkcs7/bio_pk7.c | 8 | ||||
| -rw-r--r-- | lib/libcrypto/pkcs7/pk7_mime.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libcrypto/pkcs7/bio_pk7.c b/lib/libcrypto/pkcs7/bio_pk7.c index e452293f7fe..c321bdacd9c 100644 --- a/lib/libcrypto/pkcs7/bio_pk7.c +++ b/lib/libcrypto/pkcs7/bio_pk7.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_pk7.c,v 1.8 2023/04/25 19:08:30 tb Exp $ */ +/* $OpenBSD: bio_pk7.c,v 1.9 2023/04/26 14:25:58 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -61,9 +61,3 @@ #include "asn1_local.h" /* Streaming encode support for PKCS#7 */ -BIO * -BIO_new_PKCS7(BIO *out, PKCS7 *p7) -{ - return BIO_new_NDEF(out, (ASN1_VALUE *)p7, &PKCS7_it); -} -LCRYPTO_ALIAS(BIO_new_PKCS7); diff --git a/lib/libcrypto/pkcs7/pk7_mime.c b/lib/libcrypto/pkcs7/pk7_mime.c index cd723d71f50..68767db7ce3 100644 --- a/lib/libcrypto/pkcs7/pk7_mime.c +++ b/lib/libcrypto/pkcs7/pk7_mime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_mime.c,v 1.16 2023/04/25 19:08:30 tb Exp $ */ +/* $OpenBSD: pk7_mime.c,v 1.17 2023/04/26 14:25:58 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -61,6 +61,12 @@ #include "asn1_local.h" /* PKCS#7 wrappers round generalised stream and MIME routines */ +BIO * +BIO_new_PKCS7(BIO *out, PKCS7 *p7) +{ + return BIO_new_NDEF(out, (ASN1_VALUE *)p7, &PKCS7_it); +} +LCRYPTO_ALIAS(BIO_new_PKCS7); int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags) |