diff options
-rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index b5aee01d2d..2ab61b173c 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.38 2024/07/12 09:35:54 tb Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.39 2024/07/12 09:42:24 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 | * |
@@ -109,10 +109,10 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, | |||
109 | LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ); | 109 | LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ); |
110 | 110 | ||
111 | int | 111 | int |
112 | X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, | 112 | X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int critical, |
113 | int lastpos) | 113 | int lastpos) |
114 | { | 114 | { |
115 | crit = (crit != 0); | 115 | critical = (critical != 0); |
116 | 116 | ||
117 | if (++lastpos < 0) | 117 | if (++lastpos < 0) |
118 | lastpos = 0; | 118 | lastpos = 0; |
@@ -120,7 +120,7 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, | |||
120 | for (; lastpos < X509v3_get_ext_count(sk); lastpos++) { | 120 | for (; lastpos < X509v3_get_ext_count(sk); lastpos++) { |
121 | const X509_EXTENSION *ext = X509v3_get_ext(sk, lastpos); | 121 | const X509_EXTENSION *ext = X509v3_get_ext(sk, lastpos); |
122 | 122 | ||
123 | if (X509_EXTENSION_get_critical(ext) == crit) | 123 | if (X509_EXTENSION_get_critical(ext) == critical) |
124 | return lastpos; | 124 | return lastpos; |
125 | } | 125 | } |
126 | 126 | ||
@@ -185,7 +185,7 @@ X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ext, int loc) | |||
185 | LCRYPTO_ALIAS(X509v3_add_ext); | 185 | LCRYPTO_ALIAS(X509v3_add_ext); |
186 | 186 | ||
187 | X509_EXTENSION * | 187 | X509_EXTENSION * |
188 | X509_EXTENSION_create_by_NID(X509_EXTENSION **ext, int nid, int crit, | 188 | X509_EXTENSION_create_by_NID(X509_EXTENSION **ext, int nid, int critical, |
189 | ASN1_OCTET_STRING *data) | 189 | ASN1_OCTET_STRING *data) |
190 | { | 190 | { |
191 | const ASN1_OBJECT *obj; | 191 | const ASN1_OBJECT *obj; |
@@ -195,13 +195,13 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ext, int nid, int crit, | |||
195 | return NULL; | 195 | return NULL; |
196 | } | 196 | } |
197 | 197 | ||
198 | return X509_EXTENSION_create_by_OBJ(ext, obj, crit, data); | 198 | return X509_EXTENSION_create_by_OBJ(ext, obj, critical, data); |
199 | } | 199 | } |
200 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID); | 200 | LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID); |
201 | 201 | ||
202 | X509_EXTENSION * | 202 | X509_EXTENSION * |
203 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ext, const ASN1_OBJECT *obj, | 203 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ext, const ASN1_OBJECT *obj, |
204 | int crit, ASN1_OCTET_STRING *data) | 204 | int critical, ASN1_OCTET_STRING *data) |
205 | { | 205 | { |
206 | X509_EXTENSION *ret; | 206 | X509_EXTENSION *ret; |
207 | 207 | ||
@@ -214,7 +214,7 @@ X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ext, const ASN1_OBJECT *obj, | |||
214 | 214 | ||
215 | if (!X509_EXTENSION_set_object(ret, obj)) | 215 | if (!X509_EXTENSION_set_object(ret, obj)) |
216 | goto err; | 216 | goto err; |
217 | if (!X509_EXTENSION_set_critical(ret, crit)) | 217 | if (!X509_EXTENSION_set_critical(ret, critical)) |
218 | goto err; | 218 | goto err; |
219 | if (!X509_EXTENSION_set_data(ret, data)) | 219 | if (!X509_EXTENSION_set_data(ret, data)) |
220 | goto err; | 220 | goto err; |
@@ -244,12 +244,12 @@ X509_EXTENSION_set_object(X509_EXTENSION *ext, const ASN1_OBJECT *obj) | |||
244 | LCRYPTO_ALIAS(X509_EXTENSION_set_object); | 244 | LCRYPTO_ALIAS(X509_EXTENSION_set_object); |
245 | 245 | ||
246 | int | 246 | int |
247 | X509_EXTENSION_set_critical(X509_EXTENSION *ext, int crit) | 247 | X509_EXTENSION_set_critical(X509_EXTENSION *ext, int critical) |
248 | { | 248 | { |
249 | if (ext == NULL) | 249 | if (ext == NULL) |
250 | return 0; | 250 | return 0; |
251 | 251 | ||
252 | ext->critical = crit ? 0xFF : -1; | 252 | ext->critical = critical ? 0xFF : -1; |
253 | 253 | ||
254 | return 1; | 254 | return 1; |
255 | } | 255 | } |