summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/x_x509a.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509a.c')
-rw-r--r--src/lib/libcrypto/asn1/x_x509a.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509a.c b/src/lib/libcrypto/asn1/x_x509a.c
index be8ebbdcbb..c0624d674b 100644
--- a/src/lib/libcrypto/asn1/x_x509a.c
+++ b/src/lib/libcrypto/asn1/x_x509a.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_x509a.c,v 1.12 2015/02/11 03:39:51 jsing Exp $ */ 1/* $OpenBSD: x_x509a.c,v 1.13 2015/02/11 04:00:39 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -74,13 +74,13 @@ static X509_CERT_AUX *aux_get(X509 *x);
74static const ASN1_TEMPLATE X509_CERT_AUX_seq_tt[] = { 74static const ASN1_TEMPLATE X509_CERT_AUX_seq_tt[] = {
75 { 75 {
76 .flags = ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, 76 .flags = ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL,
77 .tag = 0,
78 .offset = offsetof(X509_CERT_AUX, trust), 77 .offset = offsetof(X509_CERT_AUX, trust),
79 .field_name = "trust", 78 .field_name = "trust",
80 .item = &ASN1_OBJECT_it, 79 .item = &ASN1_OBJECT_it,
81 }, 80 },
82 { 81 {
83 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, 82 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF |
83 ASN1_TFLG_OPTIONAL,
84 .tag = 0, 84 .tag = 0,
85 .offset = offsetof(X509_CERT_AUX, reject), 85 .offset = offsetof(X509_CERT_AUX, reject),
86 .field_name = "reject", 86 .field_name = "reject",
@@ -88,20 +88,19 @@ static const ASN1_TEMPLATE X509_CERT_AUX_seq_tt[] = {
88 }, 88 },
89 { 89 {
90 .flags = ASN1_TFLG_OPTIONAL, 90 .flags = ASN1_TFLG_OPTIONAL,
91 .tag = 0,
92 .offset = offsetof(X509_CERT_AUX, alias), 91 .offset = offsetof(X509_CERT_AUX, alias),
93 .field_name = "alias", 92 .field_name = "alias",
94 .item = &ASN1_UTF8STRING_it, 93 .item = &ASN1_UTF8STRING_it,
95 }, 94 },
96 { 95 {
97 .flags = ASN1_TFLG_OPTIONAL, 96 .flags = ASN1_TFLG_OPTIONAL,
98 .tag = 0,
99 .offset = offsetof(X509_CERT_AUX, keyid), 97 .offset = offsetof(X509_CERT_AUX, keyid),
100 .field_name = "keyid", 98 .field_name = "keyid",
101 .item = &ASN1_OCTET_STRING_it, 99 .item = &ASN1_OCTET_STRING_it,
102 }, 100 },
103 { 101 {
104 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, 102 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF |
103 ASN1_TFLG_OPTIONAL,
105 .tag = 1, 104 .tag = 1,
106 .offset = offsetof(X509_CERT_AUX, other), 105 .offset = offsetof(X509_CERT_AUX, other),
107 .field_name = "other", 106 .field_name = "other",
@@ -114,7 +113,6 @@ const ASN1_ITEM X509_CERT_AUX_it = {
114 .utype = V_ASN1_SEQUENCE, 113 .utype = V_ASN1_SEQUENCE,
115 .templates = X509_CERT_AUX_seq_tt, 114 .templates = X509_CERT_AUX_seq_tt,
116 .tcount = sizeof(X509_CERT_AUX_seq_tt) / sizeof(ASN1_TEMPLATE), 115 .tcount = sizeof(X509_CERT_AUX_seq_tt) / sizeof(ASN1_TEMPLATE),
117 .funcs = NULL,
118 .size = sizeof(X509_CERT_AUX), 116 .size = sizeof(X509_CERT_AUX),
119 .sname = "X509_CERT_AUX", 117 .sname = "X509_CERT_AUX",
120}; 118};