diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index 445d2efca7..e73b3655a0 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.57 2021/11/18 16:00:15 tb Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.58 2022/01/14 07:55:29 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,40 +162,6 @@ 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 | ||
| 166 | /* We MUST make sure that, except for constness, asn1_ctx_st and | ||
| 167 | asn1_const_ctx are exactly the same. Fortunately, as soon as | ||
| 168 | the old ASN1 parsing macros are gone, we can throw this away | ||
| 169 | as well... */ | ||
| 170 | typedef struct asn1_ctx_st { | ||
| 171 | unsigned char *p;/* work char pointer */ | ||
| 172 | int eos; /* end of sequence read for indefinite encoding */ | ||
| 173 | int error; /* error code to use when returning an error */ | ||
| 174 | int inf; /* constructed if 0x20, indefinite is 0x21 */ | ||
| 175 | int tag; /* tag from last 'get object' */ | ||
| 176 | int xclass; /* class from last 'get object' */ | ||
| 177 | long slen; /* length of last 'get object' */ | ||
| 178 | unsigned char *max; /* largest value of p allowed */ | ||
| 179 | unsigned char *q;/* temporary variable */ | ||
| 180 | unsigned char **pp;/* variable */ | ||
| 181 | int line; /* used in error processing */ | ||
| 182 | } ASN1_CTX; | ||
| 183 | |||
| 184 | typedef struct asn1_const_ctx_st { | ||
| 185 | const unsigned char *p;/* work char pointer */ | ||
| 186 | int eos; /* end of sequence read for indefinite encoding */ | ||
| 187 | int error; /* error code to use when returning an error */ | ||
| 188 | int inf; /* constructed if 0x20, indefinite is 0x21 */ | ||
| 189 | int tag; /* tag from last 'get object' */ | ||
| 190 | int xclass; /* class from last 'get object' */ | ||
| 191 | long slen; /* length of last 'get object' */ | ||
| 192 | const unsigned char *max; /* largest value of p allowed */ | ||
| 193 | const unsigned char *q;/* temporary variable */ | ||
| 194 | const unsigned char **pp;/* variable */ | ||
| 195 | int line; /* used in error processing */ | ||
| 196 | } ASN1_const_CTX; | ||
| 197 | #endif | ||
| 198 | |||
| 199 | /* These are used internally in the ASN1_OBJECT to keep track of | 165 | /* These are used internally in the ASN1_OBJECT to keep track of |
| 200 | * whether the names and data need to be free()ed */ | 166 | * whether the names and data need to be free()ed */ |
| 201 | #define ASN1_OBJECT_FLAG_DYNAMIC 0x01 /* internal use */ | 167 | #define ASN1_OBJECT_FLAG_DYNAMIC 0x01 /* internal use */ |
