diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 1d5467b47d..056b6d118c 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.25 2016/11/04 10:29:19 beck Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.26 2016/12/27 16:05:57 jsing 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 | * |
@@ -140,7 +140,6 @@ struct X509_algor_st | |||
140 | ASN1_TYPE *parameter; | 140 | ASN1_TYPE *parameter; |
141 | } /* X509_ALGOR */; | 141 | } /* X509_ALGOR */; |
142 | 142 | ||
143 | DECLARE_ASN1_SET_OF(X509_ALGOR) | ||
144 | 143 | ||
145 | typedef STACK_OF(X509_ALGOR) X509_ALGORS; | 144 | typedef STACK_OF(X509_ALGOR) X509_ALGORS; |
146 | 145 | ||
@@ -172,7 +171,6 @@ typedef struct X509_name_entry_st | |||
172 | } X509_NAME_ENTRY; | 171 | } X509_NAME_ENTRY; |
173 | 172 | ||
174 | DECLARE_STACK_OF(X509_NAME_ENTRY) | 173 | DECLARE_STACK_OF(X509_NAME_ENTRY) |
175 | DECLARE_ASN1_SET_OF(X509_NAME_ENTRY) | ||
176 | 174 | ||
177 | /* we always keep X509_NAMEs in 2 forms. */ | 175 | /* we always keep X509_NAMEs in 2 forms. */ |
178 | struct X509_name_st | 176 | struct X509_name_st |
@@ -203,7 +201,6 @@ typedef struct X509_extension_st | |||
203 | typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS; | 201 | typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS; |
204 | 202 | ||
205 | DECLARE_STACK_OF(X509_EXTENSION) | 203 | DECLARE_STACK_OF(X509_EXTENSION) |
206 | DECLARE_ASN1_SET_OF(X509_EXTENSION) | ||
207 | 204 | ||
208 | /* a sequence of these are used */ | 205 | /* a sequence of these are used */ |
209 | typedef struct x509_attributes_st | 206 | typedef struct x509_attributes_st |
@@ -218,7 +215,6 @@ typedef struct x509_attributes_st | |||
218 | } X509_ATTRIBUTE; | 215 | } X509_ATTRIBUTE; |
219 | 216 | ||
220 | DECLARE_STACK_OF(X509_ATTRIBUTE) | 217 | DECLARE_STACK_OF(X509_ATTRIBUTE) |
221 | DECLARE_ASN1_SET_OF(X509_ATTRIBUTE) | ||
222 | 218 | ||
223 | 219 | ||
224 | typedef struct X509_req_info_st | 220 | typedef struct X509_req_info_st |
@@ -298,7 +294,6 @@ struct x509_st | |||
298 | } /* X509 */; | 294 | } /* X509 */; |
299 | 295 | ||
300 | DECLARE_STACK_OF(X509) | 296 | DECLARE_STACK_OF(X509) |
301 | DECLARE_ASN1_SET_OF(X509) | ||
302 | 297 | ||
303 | /* This is used for a table of trust checking functions */ | 298 | /* This is used for a table of trust checking functions */ |
304 | 299 | ||
@@ -433,7 +428,6 @@ struct x509_revoked_st | |||
433 | }; | 428 | }; |
434 | 429 | ||
435 | DECLARE_STACK_OF(X509_REVOKED) | 430 | DECLARE_STACK_OF(X509_REVOKED) |
436 | DECLARE_ASN1_SET_OF(X509_REVOKED) | ||
437 | 431 | ||
438 | typedef struct X509_crl_info_st | 432 | typedef struct X509_crl_info_st |
439 | { | 433 | { |
@@ -473,7 +467,6 @@ struct X509_crl_st | |||
473 | } /* X509_CRL */; | 467 | } /* X509_CRL */; |
474 | 468 | ||
475 | DECLARE_STACK_OF(X509_CRL) | 469 | DECLARE_STACK_OF(X509_CRL) |
476 | DECLARE_ASN1_SET_OF(X509_CRL) | ||
477 | 470 | ||
478 | typedef struct private_key_st | 471 | typedef struct private_key_st |
479 | { | 472 | { |