diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_extku.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_extku.c | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_extku.c b/src/lib/libcrypto/x509v3/v3_extku.c index 2ee7594fed..d502175593 100644 --- a/src/lib/libcrypto/x509v3/v3_extku.c +++ b/src/lib/libcrypto/x509v3/v3_extku.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: v3_extku.c,v 1.12 2015/07/25 16:00:14 jsing Exp $ */ | 1 | /* $OpenBSD: v3_extku.c,v 1.13 2015/07/29 16:13:48 jsing 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 | */ |
| @@ -69,26 +69,38 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE( | |||
| 69 | const X509V3_EXT_METHOD *method, void *eku, STACK_OF(CONF_VALUE) *extlist); | 69 | const X509V3_EXT_METHOD *method, void *eku, STACK_OF(CONF_VALUE) *extlist); |
| 70 | 70 | ||
| 71 | const X509V3_EXT_METHOD v3_ext_ku = { | 71 | const X509V3_EXT_METHOD v3_ext_ku = { |
| 72 | NID_ext_key_usage, 0, | 72 | .ext_nid = NID_ext_key_usage, |
| 73 | ASN1_ITEM_ref(EXTENDED_KEY_USAGE), | 73 | .ext_flags = 0, |
| 74 | 0, 0, 0, 0, | 74 | .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE), |
| 75 | 0, 0, | 75 | .ext_new = NULL, |
| 76 | i2v_EXTENDED_KEY_USAGE, | 76 | .ext_free = NULL, |
| 77 | v2i_EXTENDED_KEY_USAGE, | 77 | .d2i = NULL, |
| 78 | 0, 0, | 78 | .i2d = NULL, |
| 79 | NULL | 79 | .i2s = NULL, |
| 80 | .s2i = NULL, | ||
| 81 | .i2v = i2v_EXTENDED_KEY_USAGE, | ||
| 82 | .v2i = v2i_EXTENDED_KEY_USAGE, | ||
| 83 | .i2r = NULL, | ||
| 84 | .r2i = NULL, | ||
| 85 | .usr_data = NULL, | ||
| 80 | }; | 86 | }; |
| 81 | 87 | ||
| 82 | /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */ | 88 | /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */ |
| 83 | const X509V3_EXT_METHOD v3_ocsp_accresp = { | 89 | const X509V3_EXT_METHOD v3_ocsp_accresp = { |
| 84 | NID_id_pkix_OCSP_acceptableResponses, 0, | 90 | .ext_nid = NID_id_pkix_OCSP_acceptableResponses, |
| 85 | ASN1_ITEM_ref(EXTENDED_KEY_USAGE), | 91 | .ext_flags = 0, |
| 86 | 0, 0, 0, 0, | 92 | .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE), |
| 87 | 0, 0, | 93 | .ext_new = NULL, |
| 88 | i2v_EXTENDED_KEY_USAGE, | 94 | .ext_free = NULL, |
| 89 | v2i_EXTENDED_KEY_USAGE, | 95 | .d2i = NULL, |
| 90 | 0, 0, | 96 | .i2d = NULL, |
| 91 | NULL | 97 | .i2s = NULL, |
| 98 | .s2i = NULL, | ||
| 99 | .i2v = i2v_EXTENDED_KEY_USAGE, | ||
| 100 | .v2i = v2i_EXTENDED_KEY_USAGE, | ||
| 101 | .i2r = NULL, | ||
| 102 | .r2i = NULL, | ||
| 103 | .usr_data = NULL, | ||
| 92 | }; | 104 | }; |
| 93 | 105 | ||
| 94 | static const ASN1_TEMPLATE EXTENDED_KEY_USAGE_item_tt = { | 106 | static const ASN1_TEMPLATE EXTENDED_KEY_USAGE_item_tt = { |