From 82ec18edf4e632f36b6f79c239fdb6961d421a82 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 14 Jan 2022 07:49:49 +0000
Subject: 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).
---
 src/lib/libcrypto/pem/pem.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/pem')

diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index b447dc4ac2..0ea04bece7 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem.h,v 1.21 2021/12/24 12:59:17 tb Exp $ */
+/* $OpenBSD: pem.h,v 1.22 2022/01/14 07:49:49 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -482,11 +482,9 @@ DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
 
 DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
 
-#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_CRYPTO_INTERNAL)
 int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
     const EVP_CIPHER *enc, unsigned char *kstr, int klen, pem_password_cb *cb,
     void *u);
-#endif
 int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
     char *kstr, int klen,
     pem_password_cb *cb, void *u);
-- 
cgit v1.2.3-55-g6feb