diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/x509/x509v3.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h index 2bc87f6047..1aff27cd58 100644 --- a/src/lib/libcrypto/x509/x509v3.h +++ b/src/lib/libcrypto/x509/x509v3.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509v3.h,v 1.15 2022/07/12 14:42:50 kn Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.16 2022/11/07 19:42:24 schwarze 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 | */ |
| @@ -10,7 +10,7 @@ | |||
| 10 | * are met: | 10 | * are met: |
| 11 | * | 11 | * |
| 12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
| 13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
| 14 | * | 14 | * |
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
| 16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
| @@ -335,17 +335,15 @@ typedef struct POLICY_CONSTRAINTS_st { | |||
| 335 | } POLICY_CONSTRAINTS; | 335 | } POLICY_CONSTRAINTS; |
| 336 | 336 | ||
| 337 | /* Proxy certificate structures, see RFC 3820 */ | 337 | /* Proxy certificate structures, see RFC 3820 */ |
| 338 | typedef struct PROXY_POLICY_st | 338 | typedef struct PROXY_POLICY_st { |
| 339 | { | ||
| 340 | ASN1_OBJECT *policyLanguage; | 339 | ASN1_OBJECT *policyLanguage; |
| 341 | ASN1_OCTET_STRING *policy; | 340 | ASN1_OCTET_STRING *policy; |
| 342 | } PROXY_POLICY; | 341 | } PROXY_POLICY; |
| 343 | 342 | ||
| 344 | typedef struct PROXY_CERT_INFO_EXTENSION_st | 343 | typedef struct PROXY_CERT_INFO_EXTENSION_st { |
| 345 | { | ||
| 346 | ASN1_INTEGER *pcPathLengthConstraint; | 344 | ASN1_INTEGER *pcPathLengthConstraint; |
| 347 | PROXY_POLICY *proxyPolicy; | 345 | PROXY_POLICY *proxyPolicy; |
| 348 | } PROXY_CERT_INFO_EXTENSION; | 346 | } PROXY_CERT_INFO_EXTENSION; |
| 349 | 347 | ||
| 350 | PROXY_POLICY *PROXY_POLICY_new(void); | 348 | PROXY_POLICY *PROXY_POLICY_new(void); |
| 351 | void PROXY_POLICY_free(PROXY_POLICY *a); | 349 | void PROXY_POLICY_free(PROXY_POLICY *a); |
| @@ -358,15 +356,14 @@ PROXY_CERT_INFO_EXTENSION *d2i_PROXY_CERT_INFO_EXTENSION(PROXY_CERT_INFO_EXTENSI | |||
| 358 | int i2d_PROXY_CERT_INFO_EXTENSION(PROXY_CERT_INFO_EXTENSION *a, unsigned char **out); | 356 | int i2d_PROXY_CERT_INFO_EXTENSION(PROXY_CERT_INFO_EXTENSION *a, unsigned char **out); |
| 359 | extern const ASN1_ITEM PROXY_CERT_INFO_EXTENSION_it; | 357 | extern const ASN1_ITEM PROXY_CERT_INFO_EXTENSION_it; |
| 360 | 358 | ||
| 361 | struct ISSUING_DIST_POINT_st | 359 | struct ISSUING_DIST_POINT_st { |
| 362 | { | ||
| 363 | DIST_POINT_NAME *distpoint; | 360 | DIST_POINT_NAME *distpoint; |
| 364 | int onlyuser; | 361 | int onlyuser; |
| 365 | int onlyCA; | 362 | int onlyCA; |
| 366 | ASN1_BIT_STRING *onlysomereasons; | 363 | ASN1_BIT_STRING *onlysomereasons; |
| 367 | int indirectCRL; | 364 | int indirectCRL; |
| 368 | int onlyattr; | 365 | int onlyattr; |
| 369 | }; | 366 | }; |
| 370 | 367 | ||
| 371 | /* Values in idp_flags field */ | 368 | /* Values in idp_flags field */ |
| 372 | /* IDP present */ | 369 | /* IDP present */ |
| @@ -527,11 +524,11 @@ int i2d_SXNETID(SXNETID *a, unsigned char **out); | |||
| 527 | extern const ASN1_ITEM SXNETID_it; | 524 | extern const ASN1_ITEM SXNETID_it; |
| 528 | 525 | ||
| 529 | int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, | 526 | int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, |
| 530 | int userlen); | 527 | int userlen); |
| 531 | int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user, | 528 | int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user, |
| 532 | int userlen); | 529 | int userlen); |
| 533 | int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user, | 530 | int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user, |
| 534 | int userlen); | 531 | int userlen); |
| 535 | 532 | ||
| 536 | ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone); | 533 | ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone); |
| 537 | ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); | 534 | ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); |
| @@ -594,7 +591,7 @@ void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value); | |||
| 594 | void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype); | 591 | void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype); |
| 595 | int GENERAL_NAME_set0_othername(GENERAL_NAME *gen, | 592 | int GENERAL_NAME_set0_othername(GENERAL_NAME *gen, |
| 596 | ASN1_OBJECT *oid, ASN1_TYPE *value); | 593 | ASN1_OBJECT *oid, ASN1_TYPE *value); |
| 597 | int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, | 594 | int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, |
| 598 | ASN1_OBJECT **poid, ASN1_TYPE **pvalue); | 595 | ASN1_OBJECT **poid, ASN1_TYPE **pvalue); |
| 599 | 596 | ||
| 600 | char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, | 597 | char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, |
