From c26eb8a95b3a5261f9eed8e62ee8074ba1a32436 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 26 Apr 2023 14:25:58 +0000
Subject: Move BIO_new_PKCS7() to the the other streaming stuff in pk7_mime.c

---
 src/lib/libcrypto/pkcs7/bio_pk7.c  | 8 +-------
 src/lib/libcrypto/pkcs7/pk7_mime.c | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/libcrypto/pkcs7/bio_pk7.c b/src/lib/libcrypto/pkcs7/bio_pk7.c
index e452293f7f..c321bdacd9 100644
--- a/src/lib/libcrypto/pkcs7/bio_pk7.c
+++ b/src/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/src/lib/libcrypto/pkcs7/pk7_mime.c b/src/lib/libcrypto/pkcs7/pk7_mime.c
index cd723d71f5..68767db7ce 100644
--- a/src/lib/libcrypto/pkcs7/pk7_mime.c
+++ b/src/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)
-- 
cgit v1.2.3-55-g6feb