diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_req.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_req.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c index 32415979e9..0fea7e68b4 100644 --- a/src/lib/libcrypto/x509/x509_req.c +++ b/src/lib/libcrypto/x509/x509_req.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_req.c,v 1.31 2022/11/26 16:08:55 tb Exp $ */ | 1 | /* $OpenBSD: x509_req.c,v 1.32 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 | * |
| @@ -115,7 +115,7 @@ err: | |||
| 115 | X509_REQ_free(ret); | 115 | X509_REQ_free(ret); |
| 116 | return (NULL); | 116 | return (NULL); |
| 117 | } | 117 | } |
| 118 | LCRYPTO_ALIAS(X509_to_X509_REQ) | 118 | LCRYPTO_ALIAS(X509_to_X509_REQ); |
| 119 | 119 | ||
| 120 | EVP_PKEY * | 120 | EVP_PKEY * |
| 121 | X509_REQ_get_pubkey(X509_REQ *req) | 121 | X509_REQ_get_pubkey(X509_REQ *req) |
| @@ -124,7 +124,7 @@ X509_REQ_get_pubkey(X509_REQ *req) | |||
| 124 | return (NULL); | 124 | return (NULL); |
| 125 | return (X509_PUBKEY_get(req->req_info->pubkey)); | 125 | return (X509_PUBKEY_get(req->req_info->pubkey)); |
| 126 | } | 126 | } |
| 127 | LCRYPTO_ALIAS(X509_REQ_get_pubkey) | 127 | LCRYPTO_ALIAS(X509_REQ_get_pubkey); |
| 128 | 128 | ||
| 129 | EVP_PKEY * | 129 | EVP_PKEY * |
| 130 | X509_REQ_get0_pubkey(X509_REQ *req) | 130 | X509_REQ_get0_pubkey(X509_REQ *req) |
| @@ -133,7 +133,7 @@ X509_REQ_get0_pubkey(X509_REQ *req) | |||
| 133 | return NULL; | 133 | return NULL; |
| 134 | return X509_PUBKEY_get0(req->req_info->pubkey); | 134 | return X509_PUBKEY_get0(req->req_info->pubkey); |
| 135 | } | 135 | } |
| 136 | LCRYPTO_ALIAS(X509_REQ_get0_pubkey) | 136 | LCRYPTO_ALIAS(X509_REQ_get0_pubkey); |
| 137 | 137 | ||
| 138 | int | 138 | int |
| 139 | X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) | 139 | X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) |
| @@ -173,7 +173,7 @@ X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) | |||
| 173 | 173 | ||
| 174 | return (ok); | 174 | return (ok); |
| 175 | } | 175 | } |
| 176 | LCRYPTO_ALIAS(X509_REQ_check_private_key) | 176 | LCRYPTO_ALIAS(X509_REQ_check_private_key); |
| 177 | 177 | ||
| 178 | /* It seems several organisations had the same idea of including a list of | 178 | /* It seems several organisations had the same idea of including a list of |
| 179 | * extensions in a certificate request. There are at least two OIDs that are | 179 | * extensions in a certificate request. There are at least two OIDs that are |
| @@ -197,21 +197,21 @@ X509_REQ_extension_nid(int req_nid) | |||
| 197 | return 1; | 197 | return 1; |
| 198 | } | 198 | } |
| 199 | } | 199 | } |
| 200 | LCRYPTO_ALIAS(X509_REQ_extension_nid) | 200 | LCRYPTO_ALIAS(X509_REQ_extension_nid); |
| 201 | 201 | ||
| 202 | int * | 202 | int * |
| 203 | X509_REQ_get_extension_nids(void) | 203 | X509_REQ_get_extension_nids(void) |
| 204 | { | 204 | { |
| 205 | return ext_nids; | 205 | return ext_nids; |
| 206 | } | 206 | } |
| 207 | LCRYPTO_ALIAS(X509_REQ_get_extension_nids) | 207 | LCRYPTO_ALIAS(X509_REQ_get_extension_nids); |
| 208 | 208 | ||
| 209 | void | 209 | void |
| 210 | X509_REQ_set_extension_nids(int *nids) | 210 | X509_REQ_set_extension_nids(int *nids) |
| 211 | { | 211 | { |
| 212 | ext_nids = nids; | 212 | ext_nids = nids; |
| 213 | } | 213 | } |
| 214 | LCRYPTO_ALIAS(X509_REQ_set_extension_nids) | 214 | LCRYPTO_ALIAS(X509_REQ_set_extension_nids); |
| 215 | 215 | ||
| 216 | STACK_OF(X509_EXTENSION) * | 216 | STACK_OF(X509_EXTENSION) * |
| 217 | X509_REQ_get_extensions(X509_REQ *req) | 217 | X509_REQ_get_extensions(X509_REQ *req) |
| @@ -238,7 +238,7 @@ X509_REQ_get_extensions(X509_REQ *req) | |||
| 238 | p = ext->value.sequence->data; | 238 | p = ext->value.sequence->data; |
| 239 | return d2i_X509_EXTENSIONS(NULL, &p, ext->value.sequence->length); | 239 | return d2i_X509_EXTENSIONS(NULL, &p, ext->value.sequence->length); |
| 240 | } | 240 | } |
| 241 | LCRYPTO_ALIAS(X509_REQ_get_extensions) | 241 | LCRYPTO_ALIAS(X509_REQ_get_extensions); |
| 242 | 242 | ||
| 243 | /* | 243 | /* |
| 244 | * Add a STACK_OF extensions to a certificate request: allow alternative OIDs | 244 | * Add a STACK_OF extensions to a certificate request: allow alternative OIDs |
| @@ -262,7 +262,7 @@ X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts, | |||
| 262 | 262 | ||
| 263 | return rv; | 263 | return rv; |
| 264 | } | 264 | } |
| 265 | LCRYPTO_ALIAS(X509_REQ_add_extensions_nid) | 265 | LCRYPTO_ALIAS(X509_REQ_add_extensions_nid); |
| 266 | 266 | ||
| 267 | /* This is the normal usage: use the "official" OID */ | 267 | /* This is the normal usage: use the "official" OID */ |
| 268 | int | 268 | int |
| @@ -270,7 +270,7 @@ X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) | |||
| 270 | { | 270 | { |
| 271 | return X509_REQ_add_extensions_nid(req, exts, NID_ext_req); | 271 | return X509_REQ_add_extensions_nid(req, exts, NID_ext_req); |
| 272 | } | 272 | } |
| 273 | LCRYPTO_ALIAS(X509_REQ_add_extensions) | 273 | LCRYPTO_ALIAS(X509_REQ_add_extensions); |
| 274 | 274 | ||
| 275 | /* Request attribute functions */ | 275 | /* Request attribute functions */ |
| 276 | 276 | ||
| @@ -279,14 +279,14 @@ X509_REQ_get_attr_count(const X509_REQ *req) | |||
| 279 | { | 279 | { |
| 280 | return X509at_get_attr_count(req->req_info->attributes); | 280 | return X509at_get_attr_count(req->req_info->attributes); |
| 281 | } | 281 | } |
| 282 | LCRYPTO_ALIAS(X509_REQ_get_attr_count) | 282 | LCRYPTO_ALIAS(X509_REQ_get_attr_count); |
| 283 | 283 | ||
| 284 | int | 284 | int |
| 285 | X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos) | 285 | X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos) |
| 286 | { | 286 | { |
| 287 | return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos); | 287 | return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos); |
| 288 | } | 288 | } |
| 289 | LCRYPTO_ALIAS(X509_REQ_get_attr_by_NID) | 289 | LCRYPTO_ALIAS(X509_REQ_get_attr_by_NID); |
| 290 | 290 | ||
| 291 | int | 291 | int |
| 292 | X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, | 292 | X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, |
| @@ -294,21 +294,21 @@ X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, | |||
| 294 | { | 294 | { |
| 295 | return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos); | 295 | return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos); |
| 296 | } | 296 | } |
| 297 | LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ) | 297 | LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ); |
| 298 | 298 | ||
| 299 | X509_ATTRIBUTE * | 299 | X509_ATTRIBUTE * |
| 300 | X509_REQ_get_attr(const X509_REQ *req, int loc) | 300 | X509_REQ_get_attr(const X509_REQ *req, int loc) |
| 301 | { | 301 | { |
| 302 | return X509at_get_attr(req->req_info->attributes, loc); | 302 | return X509at_get_attr(req->req_info->attributes, loc); |
| 303 | } | 303 | } |
| 304 | LCRYPTO_ALIAS(X509_REQ_get_attr) | 304 | LCRYPTO_ALIAS(X509_REQ_get_attr); |
| 305 | 305 | ||
| 306 | X509_ATTRIBUTE * | 306 | X509_ATTRIBUTE * |
| 307 | X509_REQ_delete_attr(X509_REQ *req, int loc) | 307 | X509_REQ_delete_attr(X509_REQ *req, int loc) |
| 308 | { | 308 | { |
| 309 | return X509at_delete_attr(req->req_info->attributes, loc); | 309 | return X509at_delete_attr(req->req_info->attributes, loc); |
| 310 | } | 310 | } |
| 311 | LCRYPTO_ALIAS(X509_REQ_delete_attr) | 311 | LCRYPTO_ALIAS(X509_REQ_delete_attr); |
| 312 | 312 | ||
| 313 | int | 313 | int |
| 314 | X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) | 314 | X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) |
| @@ -317,7 +317,7 @@ X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) | |||
| 317 | return 1; | 317 | return 1; |
| 318 | return 0; | 318 | return 0; |
| 319 | } | 319 | } |
| 320 | LCRYPTO_ALIAS(X509_REQ_add1_attr) | 320 | LCRYPTO_ALIAS(X509_REQ_add1_attr); |
| 321 | 321 | ||
| 322 | int | 322 | int |
| 323 | X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type, | 323 | X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type, |
| @@ -328,7 +328,7 @@ X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type, | |||
| 328 | return 1; | 328 | return 1; |
| 329 | return 0; | 329 | return 0; |
| 330 | } | 330 | } |
| 331 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_OBJ) | 331 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_OBJ); |
| 332 | 332 | ||
| 333 | int | 333 | int |
| 334 | X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, | 334 | X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, |
| @@ -339,7 +339,7 @@ X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, | |||
| 339 | return 1; | 339 | return 1; |
| 340 | return 0; | 340 | return 0; |
| 341 | } | 341 | } |
| 342 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_NID) | 342 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_NID); |
| 343 | 343 | ||
| 344 | int | 344 | int |
| 345 | X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, | 345 | X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, |
| @@ -350,7 +350,7 @@ X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, | |||
| 350 | return 1; | 350 | return 1; |
| 351 | return 0; | 351 | return 0; |
| 352 | } | 352 | } |
| 353 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_txt) | 353 | LCRYPTO_ALIAS(X509_REQ_add1_attr_by_txt); |
| 354 | 354 | ||
| 355 | int | 355 | int |
| 356 | i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) | 356 | i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) |
| @@ -358,4 +358,4 @@ i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) | |||
| 358 | req->req_info->enc.modified = 1; | 358 | req->req_info->enc.modified = 1; |
| 359 | return i2d_X509_REQ_INFO(req->req_info, pp); | 359 | return i2d_X509_REQ_INFO(req->req_info, pp); |
| 360 | } | 360 | } |
| 361 | LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs) | 361 | LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs); |
