diff options
author | beck <> | 2023-07-07 19:37:54 +0000 |
---|---|---|
committer | beck <> | 2023-07-07 19:37:54 +0000 |
commit | 8d42940c1d19bb9bd4ce45580f18a59069225432 (patch) | |
tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/x_x509a.c | |
parent | 1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff) | |
download | openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2 openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.zip |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509a.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_x509a.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509a.c b/src/lib/libcrypto/asn1/x_x509a.c index 36c7599bc6..2b6fe7fcec 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.20 2023/07/05 21:23:37 beck Exp $ */ | 1 | /* $OpenBSD: x_x509a.c,v 1.21 2023/07/07 19:37:53 beck 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 | */ |
@@ -126,28 +126,24 @@ d2i_X509_CERT_AUX(X509_CERT_AUX **a, const unsigned char **in, long len) | |||
126 | return (X509_CERT_AUX *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 126 | return (X509_CERT_AUX *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
127 | &X509_CERT_AUX_it); | 127 | &X509_CERT_AUX_it); |
128 | } | 128 | } |
129 | LCRYPTO_ALIAS(d2i_X509_CERT_AUX); | ||
130 | 129 | ||
131 | int | 130 | int |
132 | i2d_X509_CERT_AUX(X509_CERT_AUX *a, unsigned char **out) | 131 | i2d_X509_CERT_AUX(X509_CERT_AUX *a, unsigned char **out) |
133 | { | 132 | { |
134 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CERT_AUX_it); | 133 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CERT_AUX_it); |
135 | } | 134 | } |
136 | LCRYPTO_ALIAS(i2d_X509_CERT_AUX); | ||
137 | 135 | ||
138 | X509_CERT_AUX * | 136 | X509_CERT_AUX * |
139 | X509_CERT_AUX_new(void) | 137 | X509_CERT_AUX_new(void) |
140 | { | 138 | { |
141 | return (X509_CERT_AUX *)ASN1_item_new(&X509_CERT_AUX_it); | 139 | return (X509_CERT_AUX *)ASN1_item_new(&X509_CERT_AUX_it); |
142 | } | 140 | } |
143 | LCRYPTO_ALIAS(X509_CERT_AUX_new); | ||
144 | 141 | ||
145 | void | 142 | void |
146 | X509_CERT_AUX_free(X509_CERT_AUX *a) | 143 | X509_CERT_AUX_free(X509_CERT_AUX *a) |
147 | { | 144 | { |
148 | ASN1_item_free((ASN1_VALUE *)a, &X509_CERT_AUX_it); | 145 | ASN1_item_free((ASN1_VALUE *)a, &X509_CERT_AUX_it); |
149 | } | 146 | } |
150 | LCRYPTO_ALIAS(X509_CERT_AUX_free); | ||
151 | 147 | ||
152 | static X509_CERT_AUX * | 148 | static X509_CERT_AUX * |
153 | aux_get(X509 *x) | 149 | aux_get(X509 *x) |
@@ -176,7 +172,6 @@ X509_alias_set1(X509 *x, const unsigned char *name, int len) | |||
176 | return 0; | 172 | return 0; |
177 | return ASN1_STRING_set(aux->alias, name, len); | 173 | return ASN1_STRING_set(aux->alias, name, len); |
178 | } | 174 | } |
179 | LCRYPTO_ALIAS(X509_alias_set1); | ||
180 | 175 | ||
181 | int | 176 | int |
182 | X509_keyid_set1(X509 *x, const unsigned char *id, int len) | 177 | X509_keyid_set1(X509 *x, const unsigned char *id, int len) |
@@ -195,7 +190,6 @@ X509_keyid_set1(X509 *x, const unsigned char *id, int len) | |||
195 | return 0; | 190 | return 0; |
196 | return ASN1_STRING_set(aux->keyid, id, len); | 191 | return ASN1_STRING_set(aux->keyid, id, len); |
197 | } | 192 | } |
198 | LCRYPTO_ALIAS(X509_keyid_set1); | ||
199 | 193 | ||
200 | unsigned char * | 194 | unsigned char * |
201 | X509_alias_get0(X509 *x, int *len) | 195 | X509_alias_get0(X509 *x, int *len) |
@@ -206,7 +200,6 @@ X509_alias_get0(X509 *x, int *len) | |||
206 | *len = x->aux->alias->length; | 200 | *len = x->aux->alias->length; |
207 | return x->aux->alias->data; | 201 | return x->aux->alias->data; |
208 | } | 202 | } |
209 | LCRYPTO_ALIAS(X509_alias_get0); | ||
210 | 203 | ||
211 | unsigned char * | 204 | unsigned char * |
212 | X509_keyid_get0(X509 *x, int *len) | 205 | X509_keyid_get0(X509 *x, int *len) |
@@ -217,7 +210,6 @@ X509_keyid_get0(X509 *x, int *len) | |||
217 | *len = x->aux->keyid->length; | 210 | *len = x->aux->keyid->length; |
218 | return x->aux->keyid->data; | 211 | return x->aux->keyid->data; |
219 | } | 212 | } |
220 | LCRYPTO_ALIAS(X509_keyid_get0); | ||
221 | 213 | ||
222 | int | 214 | int |
223 | X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj) | 215 | X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj) |
@@ -240,7 +232,6 @@ X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj) | |||
240 | ASN1_OBJECT_free(objtmp); | 232 | ASN1_OBJECT_free(objtmp); |
241 | return 0; | 233 | return 0; |
242 | } | 234 | } |
243 | LCRYPTO_ALIAS(X509_add1_trust_object); | ||
244 | 235 | ||
245 | int | 236 | int |
246 | X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj) | 237 | X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj) |
@@ -263,7 +254,6 @@ X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj) | |||
263 | ASN1_OBJECT_free(objtmp); | 254 | ASN1_OBJECT_free(objtmp); |
264 | return 0; | 255 | return 0; |
265 | } | 256 | } |
266 | LCRYPTO_ALIAS(X509_add1_reject_object); | ||
267 | 257 | ||
268 | void | 258 | void |
269 | X509_trust_clear(X509 *x) | 259 | X509_trust_clear(X509 *x) |
@@ -273,7 +263,6 @@ X509_trust_clear(X509 *x) | |||
273 | x->aux->trust = NULL; | 263 | x->aux->trust = NULL; |
274 | } | 264 | } |
275 | } | 265 | } |
276 | LCRYPTO_ALIAS(X509_trust_clear); | ||
277 | 266 | ||
278 | void | 267 | void |
279 | X509_reject_clear(X509 *x) | 268 | X509_reject_clear(X509 *x) |
@@ -283,4 +272,3 @@ X509_reject_clear(X509 *x) | |||
283 | x->aux->reject = NULL; | 272 | x->aux->reject = NULL; |
284 | } | 273 | } |
285 | } | 274 | } |
286 | LCRYPTO_ALIAS(X509_reject_clear); | ||