From 8c60ea70a3180083dd57070d774a38f43ce0ea08 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/objects/objects.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/objects/objects.h')

diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index 2aaaefd96b..3ed792bb34 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.14 2022/01/08 21:36:39 tb Exp $ */
+/* $OpenBSD: objects.h,v 1.15 2022/01/14 07:49:49 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1105,10 +1105,8 @@ int		OBJ_create(const char *oid, const char *sn, const char *ln);
 void		OBJ_cleanup(void);
 int		OBJ_create_objects(BIO *in);
 
-#if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API)
 size_t OBJ_length(const ASN1_OBJECT *obj);
 const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
-#endif
 
 int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
 int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-- 
cgit v1.2.3-55-g6feb