summaryrefslogtreecommitdiff
path: root/lib/libcrypto/asn1
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2024-08-31 09:26:19 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2024-08-31 09:26:19 +0000
commit1d5d5b7433dda1fc2c048def6371dc5e4e07f7d6 (patch)
tree5f046e0cd9b61af794659328d88cf6c774405d18 /lib/libcrypto/asn1
parente3e2d2cf200f166d26784eb9e20081a27b8494dd (diff)
Unexport some conf layers unused outside of libcrypto
imodules are called imodules because they contain Information about modules that have been Initialized. Which one of these two I it is is anyone's best guess. Why anything outside of libcrypto would ever possibly care will also remain a mystery. Remove the old way of adding a conf module, user data, stop allowing to set a method (it's opaque now, remember?) and drop a couple bits more from the public api interface. ok beck jsing
Diffstat (limited to 'lib/libcrypto/asn1')
-rw-r--r--lib/libcrypto/asn1/asn1_gen.c3
-rw-r--r--lib/libcrypto/asn1/asn_moid.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libcrypto/asn1/asn1_gen.c b/lib/libcrypto/asn1/asn1_gen.c
index c7eafd72677..4b8d7051abf 100644
--- a/lib/libcrypto/asn1/asn1_gen.c
+++ b/lib/libcrypto/asn1/asn1_gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_gen.c,v 1.22 2024/05/17 02:57:26 tb Exp $ */
+/* $OpenBSD: asn1_gen.c,v 1.23 2024/08/31 09:26:18 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2002.
*/
@@ -63,6 +63,7 @@
#include <openssl/x509v3.h>
#include "asn1_local.h"
+#include "conf_local.h"
#define ASN1_GEN_FLAG 0x10000
#define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG|1)
diff --git a/lib/libcrypto/asn1/asn_moid.c b/lib/libcrypto/asn1/asn_moid.c
index 68749804632..e3c7d09446c 100644
--- a/lib/libcrypto/asn1/asn_moid.c
+++ b/lib/libcrypto/asn1/asn_moid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn_moid.c,v 1.17 2024/03/02 09:02:04 tb Exp $ */
+/* $OpenBSD: asn_moid.c,v 1.18 2024/08/31 09:26:18 tb Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@@ -66,6 +66,7 @@
#include <openssl/x509.h>
#include "asn1_local.h"
+#include "conf_local.h"
/* Simple ASN1 OID module: add all objects in a given section */