diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_v3.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index 27f670c450..8dddb463ce 100644 --- a/src/lib/libcrypto/x509/x509_v3.c +++ b/src/lib/libcrypto/x509/x509_v3.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_v3.c,v 1.20 2022/11/26 16:08:55 tb Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.21 2023/02/16 08:38:17 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 | * |
@@ -75,7 +75,7 @@ X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x) | |||
75 | return (0); | 75 | return (0); |
76 | return (sk_X509_EXTENSION_num(x)); | 76 | return (sk_X509_EXTENSION_num(x)); |
77 | } | 77 | } |
78 | LCRYPTO_ALIAS(X509v3_get_ext_count) | 78 | LCRYPTO_ALIAS(X509v3_get_ext_count); |
79 | 79 | ||
80 | int | 80 | int |
81 | X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos) | 81 | X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos) |
@@ -87,7 +87,7 @@ X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos) | |||
87 | return (-2); | 87 | return (-2); |
88 | return (X509v3_get_ext_by_OBJ(x, obj, lastpos)); | 88 | return (X509v3_get_ext_by_OBJ(x, obj, lastpos)); |
89 | } | 89 | } |
90 | LCRYPTO_ALIAS(X509v3_get_ext_by_NID) | 90 | LCRYPTO_ALIAS(X509v3_get_ext_by_NID); |
91 | 91 | ||
92 | int | 92 | int |
93 | X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, | 93 | X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, |
@@ -109,7 +109,7 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, | |||
109 | } | 109 | } |
110 | return (-1); | 110 | return (-1); |
111 | } | 111 | } |
112 | LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ) | 112 | LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ); |
113 | 113 | ||
114 | int | 114 | int |
115 | X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, | 115 | X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, |
@@ -132,7 +132,7 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, | |||
132 | } | 132 | } |
133 | return (-1); | 133 | return (-1); |
134 | } | 134 | } |
135 | LCRYPTO_ALIAS(X509v3_get_ext_by_critical) | 135 | LCRYPTO_ALIAS(X509v3_get_ext_by_critical); |
136 | 136 | ||
137 | X509_EXTENSION * | 137 | X509_EXTENSION * |
138 | X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc) | 138 | X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc) |
@@ -142,7 +142,7 @@ X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc) | |||
142 | else | 142 | else |
143 | return sk_X509_EXTENSION_value(x, loc); | 143 | return sk_X509_EXTENSION_value(x, loc); |
144 | } | 144 | } |
145 | LCRYPTO_ALIAS(X509v3_get_ext) | 145 | LCRYPTO_ALIAS(X509v3_get_ext); |
146 | 146 | ||
147 | X509_EXTENSION * | 147 | X509_EXTENSION * |
148 | X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc) | 148 | X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc) |
@@ -154,7 +154,7 @@ X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc) | |||
154 | ret = sk_X509_EXTENSION_delete(x, loc); | 154 | ret = sk_X509_EXTENSION_delete(x, loc); |
155 | return (ret); | 155 | return (ret); |
156 | } | 156 | } |
157 | LCRYPTO_ALIAS(X509v3_delete_ext) | 157 | LCRYPTO_ALIAS(X509v3_delete_ext); |
158 | 158 | ||
159 | STACK_OF(X509_EXTENSION) * | 159 | STACK_OF(X509_EXTENSION) * |
160 | X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc) | 160 | X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc) |
@@ -197,7 +197,7 @@ err2: | |||
197 | sk_X509_EXTENSION_free(sk); | 197 | sk_X509_EXTENSION_free(sk); |
198 | return (NULL); | 198 | return (NULL); |
199 | } | 199 | } |
200 | LCRYPTO_ALIAS(X509v3_add_ext) | 200 | LCRYPTO_ALIAS(X509v3_add_ext); |
201 | 201 | ||
202 | X509_EXTENSION * | 202 | X509_EXTENSION * |
203 | X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, | 203 | X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, |
@@ -216,7 +216,7 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, | |||
216 | ASN1_OBJECT_free(obj); | 216 | ASN1_OBJECT_free(obj); |
217 | return (ret); | 217 | return (ret); |
218 | } | 218 | } |
219 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID) | 219 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID); |
220 | 220 | ||
221 | X509_EXTENSION * | 221 | X509_EXTENSION * |
222 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj, | 222 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj, |
@@ -248,7 +248,7 @@ err: | |||
248 | X509_EXTENSION_free(ret); | 248 | X509_EXTENSION_free(ret); |
249 | return (NULL); | 249 | return (NULL); |
250 | } | 250 | } |
251 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_OBJ) | 251 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_OBJ); |
252 | 252 | ||
253 | int | 253 | int |
254 | X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) | 254 | X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) |
@@ -259,7 +259,7 @@ X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) | |||
259 | ex->object = OBJ_dup(obj); | 259 | ex->object = OBJ_dup(obj); |
260 | return ex->object != NULL; | 260 | return ex->object != NULL; |
261 | } | 261 | } |
262 | LCRYPTO_ALIAS(X509_EXTENSION_set_object) | 262 | LCRYPTO_ALIAS(X509_EXTENSION_set_object); |
263 | 263 | ||
264 | int | 264 | int |
265 | X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) | 265 | X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) |
@@ -269,7 +269,7 @@ X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) | |||
269 | ex->critical = (crit) ? 0xFF : -1; | 269 | ex->critical = (crit) ? 0xFF : -1; |
270 | return (1); | 270 | return (1); |
271 | } | 271 | } |
272 | LCRYPTO_ALIAS(X509_EXTENSION_set_critical) | 272 | LCRYPTO_ALIAS(X509_EXTENSION_set_critical); |
273 | 273 | ||
274 | int | 274 | int |
275 | X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) | 275 | X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) |
@@ -283,7 +283,7 @@ X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) | |||
283 | return (0); | 283 | return (0); |
284 | return (1); | 284 | return (1); |
285 | } | 285 | } |
286 | LCRYPTO_ALIAS(X509_EXTENSION_set_data) | 286 | LCRYPTO_ALIAS(X509_EXTENSION_set_data); |
287 | 287 | ||
288 | ASN1_OBJECT * | 288 | ASN1_OBJECT * |
289 | X509_EXTENSION_get_object(X509_EXTENSION *ex) | 289 | X509_EXTENSION_get_object(X509_EXTENSION *ex) |
@@ -292,7 +292,7 @@ X509_EXTENSION_get_object(X509_EXTENSION *ex) | |||
292 | return (NULL); | 292 | return (NULL); |
293 | return (ex->object); | 293 | return (ex->object); |
294 | } | 294 | } |
295 | LCRYPTO_ALIAS(X509_EXTENSION_get_object) | 295 | LCRYPTO_ALIAS(X509_EXTENSION_get_object); |
296 | 296 | ||
297 | ASN1_OCTET_STRING * | 297 | ASN1_OCTET_STRING * |
298 | X509_EXTENSION_get_data(X509_EXTENSION *ex) | 298 | X509_EXTENSION_get_data(X509_EXTENSION *ex) |
@@ -301,7 +301,7 @@ X509_EXTENSION_get_data(X509_EXTENSION *ex) | |||
301 | return (NULL); | 301 | return (NULL); |
302 | return (ex->value); | 302 | return (ex->value); |
303 | } | 303 | } |
304 | LCRYPTO_ALIAS(X509_EXTENSION_get_data) | 304 | LCRYPTO_ALIAS(X509_EXTENSION_get_data); |
305 | 305 | ||
306 | int | 306 | int |
307 | X509_EXTENSION_get_critical(const X509_EXTENSION *ex) | 307 | X509_EXTENSION_get_critical(const X509_EXTENSION *ex) |
@@ -312,4 +312,4 @@ X509_EXTENSION_get_critical(const X509_EXTENSION *ex) | |||
312 | return 1; | 312 | return 1; |
313 | return 0; | 313 | return 0; |
314 | } | 314 | } |
315 | LCRYPTO_ALIAS(X509_EXTENSION_get_critical) | 315 | LCRYPTO_ALIAS(X509_EXTENSION_get_critical); |