summaryrefslogtreecommitdiff
path: root/lib/libcrypto/asn1/asn1.h
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2022-01-14 08:09:19 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2022-01-14 08:09:19 +0000
commitd8c7e163866cdd6590446533edc4b99427e179d3 (patch)
tree89f6bae9b50746f16b434d93105f5e1139165904 /lib/libcrypto/asn1/asn1.h
parentceb3333d437161ee32dbad9c8466519b8189922b (diff)
Remove ASN1_OBJECT internals from public visibility.
Move the struct declaration to asn1_locl.h and add a forward declaration to ossl_typ.h. This makes struct visibility in the asn1 headers match OpenSSL. ok inoguchi jsing
Diffstat (limited to 'lib/libcrypto/asn1/asn1.h')
-rw-r--r--lib/libcrypto/asn1/asn1.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index e850f2b8019..2e854f511ef 100644
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.59 2022/01/14 07:57:17 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.60 2022/01/14 08:09:18 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -162,20 +162,6 @@ DECLARE_STACK_OF(X509_ALGOR)
#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC 0x01 /* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL 0x02 /* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04 /* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 0x08 /* internal use */
-typedef struct asn1_object_st {
- const char *sn, *ln;
- int nid;
- int length;
- const unsigned char *data; /* data remains const after init */
- int flags; /* Should we free this one */
-} ASN1_OBJECT;
-
#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
/* This indicates that the ASN1_STRING is not a real value but just a place
* holder for the location where indefinite length constructed data should