summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2021-11-18 16:00:15 +0000
committertb <>2021-11-18 16:00:15 +0000
commit2382c14239643c5fa5996c148277d7934afe6c6b (patch)
tree22e897042a93f250ead3b1f9c72bb98dacd7373a /src
parent92b13b248651f8593c8898bbdd8dc9823b1c1afd (diff)
downloadopenbsd-2382c14239643c5fa5996c148277d7934afe6c6b.tar.gz
openbsd-2382c14239643c5fa5996c148277d7934afe6c6b.tar.bz2
openbsd-2382c14239643c5fa5996c148277d7934afe6c6b.zip
Prevent future internal use of ASN1_CTX and ASN1_const_CTX by wrapping
them inside #ifndef LIBRESSL_INTERNAL. suggested by jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/asn1.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 815256a30d..445d2efca7 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1.h,v 1.56 2021/11/01 08:14:36 tb Exp $ */ 1/* $OpenBSD: asn1.h,v 1.57 2021/11/18 16:00:15 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -162,6 +162,7 @@ DECLARE_STACK_OF(X509_ALGOR)
162#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */ 162#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
163#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */ 163#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
164 164
165#ifndef LIBRESSL_INTERNAL
165/* We MUST make sure that, except for constness, asn1_ctx_st and 166/* We MUST make sure that, except for constness, asn1_ctx_st and
166 asn1_const_ctx are exactly the same. Fortunately, as soon as 167 asn1_const_ctx are exactly the same. Fortunately, as soon as
167 the old ASN1 parsing macros are gone, we can throw this away 168 the old ASN1 parsing macros are gone, we can throw this away
@@ -193,6 +194,7 @@ typedef struct asn1_const_ctx_st {
193 const unsigned char **pp;/* variable */ 194 const unsigned char **pp;/* variable */
194 int line; /* used in error processing */ 195 int line; /* used in error processing */
195} ASN1_const_CTX; 196} ASN1_const_CTX;
197#endif
196 198
197/* These are used internally in the ASN1_OBJECT to keep track of 199/* These are used internally in the ASN1_OBJECT to keep track of
198 * whether the names and data need to be free()ed */ 200 * whether the names and data need to be free()ed */