Unifdef LIBRESSL_OPAQUE_* and LIBRESSL_NEXT_API

This marks the start of major surgery in libcrypto. Do not attempt to
build the tree for a while (~50 commits).

1 files changed, 1 insertions, 5 deletions

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 23d47367d4..d715deb2eb 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.50 2022/01/05 20:48:44 tb Exp $ */
+/* $OpenBSD: bio.h,v 1.51 2022/01/14 07:49:49 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -632,14 +632,10 @@ BIO *	BIO_pop(BIO *b);
 void    BIO_free_all(BIO *a);
 BIO *   BIO_find_type(BIO *b, int bio_type);
 BIO *   BIO_next(BIO *b);
-#if defined(LIBRESSL_OPAQUE_BIO) || defined(LIBRESSL_CRYPTO_INTERNAL)
 void    BIO_set_next(BIO *b, BIO *next);
-#endif
 BIO *   BIO_get_retry_BIO(BIO *bio, int *reason);
 int     BIO_get_retry_reason(BIO *bio);
-#if defined(LIBRESSL_OPAQUE_BIO) || defined(LIBRESSL_CRYPTO_INTERNAL)
 void    BIO_set_retry_reason(BIO *bio, int reason);
-#endif
 BIO *   BIO_dup_chain(BIO *in);
 
 int BIO_nread0(BIO *bio, char **buf);