summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/x_req.c
diff options
context:
space:
mode:
authorjsing <>2015-02-11 04:00:39 +0000
committerjsing <>2015-02-11 04:00:39 +0000
commit049efcbf6850b4b7cb7b66f303c7f35a88efa2ff (patch)
tree9a3e16feaaa38e364b197e209eb7978d0cea7d57 /src/lib/libcrypto/asn1/x_req.c
parent4a2309d8058f17b675c178c4996662495981382e (diff)
downloadopenbsd-049efcbf6850b4b7cb7b66f303c7f35a88efa2ff.tar.gz
openbsd-049efcbf6850b4b7cb7b66f303c7f35a88efa2ff.tar.bz2
openbsd-049efcbf6850b4b7cb7b66f303c7f35a88efa2ff.zip
Remove initialisers with default values from the ASN1 data structures.
Minor changes in generated assembly due to the compiler swapping from .quad 0/.long 0 to .zero, along with changes due to line numbering.
Diffstat (limited to 'src/lib/libcrypto/asn1/x_req.c')
-rw-r--r--src/lib/libcrypto/asn1/x_req.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
index 5e8aa21b0d..5ffa11e2dd 100644
--- a/src/lib/libcrypto/asn1/x_req.c
+++ b/src/lib/libcrypto/asn1/x_req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_req.c,v 1.14 2015/02/11 03:39:51 jsing Exp $ */ 1/* $OpenBSD: x_req.c,v 1.15 2015/02/11 04:00:39 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 *
@@ -93,31 +93,22 @@ rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
93} 93}
94 94
95static const ASN1_AUX X509_REQ_INFO_aux = { 95static const ASN1_AUX X509_REQ_INFO_aux = {
96 .app_data = NULL,
97 .flags = ASN1_AFLG_ENCODING, 96 .flags = ASN1_AFLG_ENCODING,
98 .ref_offset = 0,
99 .ref_lock = 0,
100 .asn1_cb = rinf_cb, 97 .asn1_cb = rinf_cb,
101 .enc_offset = offsetof(X509_REQ_INFO, enc), 98 .enc_offset = offsetof(X509_REQ_INFO, enc),
102}; 99};
103static const ASN1_TEMPLATE X509_REQ_INFO_seq_tt[] = { 100static const ASN1_TEMPLATE X509_REQ_INFO_seq_tt[] = {
104 { 101 {
105 .flags = 0,
106 .tag = 0,
107 .offset = offsetof(X509_REQ_INFO, version), 102 .offset = offsetof(X509_REQ_INFO, version),
108 .field_name = "version", 103 .field_name = "version",
109 .item = &ASN1_INTEGER_it, 104 .item = &ASN1_INTEGER_it,
110 }, 105 },
111 { 106 {
112 .flags = 0,
113 .tag = 0,
114 .offset = offsetof(X509_REQ_INFO, subject), 107 .offset = offsetof(X509_REQ_INFO, subject),
115 .field_name = "subject", 108 .field_name = "subject",
116 .item = &X509_NAME_it, 109 .item = &X509_NAME_it,
117 }, 110 },
118 { 111 {
119 .flags = 0,
120 .tag = 0,
121 .offset = offsetof(X509_REQ_INFO, pubkey), 112 .offset = offsetof(X509_REQ_INFO, pubkey),
122 .field_name = "pubkey", 113 .field_name = "pubkey",
123 .item = &X509_PUBKEY_it, 114 .item = &X509_PUBKEY_it,
@@ -127,7 +118,6 @@ static const ASN1_TEMPLATE X509_REQ_INFO_seq_tt[] = {
127 */ 118 */
128 { 119 {
129 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL, 120 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL,
130 .tag = 0,
131 .offset = offsetof(X509_REQ_INFO, attributes), 121 .offset = offsetof(X509_REQ_INFO, attributes),
132 .field_name = "attributes", 122 .field_name = "attributes",
133 .item = &X509_ATTRIBUTE_it, 123 .item = &X509_ATTRIBUTE_it,
@@ -175,27 +165,19 @@ static const ASN1_AUX X509_REQ_aux = {
175 .flags = ASN1_AFLG_REFCOUNT, 165 .flags = ASN1_AFLG_REFCOUNT,
176 .ref_offset = offsetof(X509_REQ, references), 166 .ref_offset = offsetof(X509_REQ, references),
177 .ref_lock = CRYPTO_LOCK_X509_REQ, 167 .ref_lock = CRYPTO_LOCK_X509_REQ,
178 .asn1_cb = 0,
179 .enc_offset = 0,
180}; 168};
181static const ASN1_TEMPLATE X509_REQ_seq_tt[] = { 169static const ASN1_TEMPLATE X509_REQ_seq_tt[] = {
182 { 170 {
183 .flags = 0,
184 .tag = 0,
185 .offset = offsetof(X509_REQ, req_info), 171 .offset = offsetof(X509_REQ, req_info),
186 .field_name = "req_info", 172 .field_name = "req_info",
187 .item = &X509_REQ_INFO_it, 173 .item = &X509_REQ_INFO_it,
188 }, 174 },
189 { 175 {
190 .flags = 0,
191 .tag = 0,
192 .offset = offsetof(X509_REQ, sig_alg), 176 .offset = offsetof(X509_REQ, sig_alg),
193 .field_name = "sig_alg", 177 .field_name = "sig_alg",
194 .item = &X509_ALGOR_it, 178 .item = &X509_ALGOR_it,
195 }, 179 },
196 { 180 {
197 .flags = 0,
198 .tag = 0,
199 .offset = offsetof(X509_REQ, signature), 181 .offset = offsetof(X509_REQ, signature),
200 .field_name = "signature", 182 .field_name = "signature",
201 .item = &ASN1_BIT_STRING_it, 183 .item = &ASN1_BIT_STRING_it,