diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_pmaps.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_pmaps.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_pmaps.c b/src/lib/libcrypto/x509v3/v3_pmaps.c index 32ab04eda9..f2d9090157 100644 --- a/src/lib/libcrypto/x509v3/v3_pmaps.c +++ b/src/lib/libcrypto/x509v3/v3_pmaps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: v3_pmaps.c,v 1.8 2015/07/25 16:00:14 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pmaps.c,v 1.9 2015/07/29 16:13:49 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. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -70,14 +70,20 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS( | |||
| 70 | const X509V3_EXT_METHOD *method, void *pmps, STACK_OF(CONF_VALUE) *extlist); | 70 | const X509V3_EXT_METHOD *method, void *pmps, STACK_OF(CONF_VALUE) *extlist); |
| 71 | 71 | ||
| 72 | const X509V3_EXT_METHOD v3_policy_mappings = { | 72 | const X509V3_EXT_METHOD v3_policy_mappings = { |
| 73 | NID_policy_mappings, 0, | 73 | .ext_nid = NID_policy_mappings, |
| 74 | ASN1_ITEM_ref(POLICY_MAPPINGS), | 74 | .ext_flags = 0, |
| 75 | 0, 0, 0, 0, | 75 | .it = ASN1_ITEM_ref(POLICY_MAPPINGS), |
| 76 | 0, 0, | 76 | .ext_new = NULL, |
| 77 | i2v_POLICY_MAPPINGS, | 77 | .ext_free = NULL, |
| 78 | v2i_POLICY_MAPPINGS, | 78 | .d2i = NULL, |
| 79 | 0, 0, | 79 | .i2d = NULL, |
| 80 | NULL | 80 | .i2s = NULL, |
| 81 | .s2i = NULL, | ||
| 82 | .i2v = i2v_POLICY_MAPPINGS, | ||
| 83 | .v2i = v2i_POLICY_MAPPINGS, | ||
| 84 | .i2r = NULL, | ||
| 85 | .r2i = NULL, | ||
| 86 | .usr_data = NULL, | ||
| 81 | }; | 87 | }; |
| 82 | 88 | ||
| 83 | static const ASN1_TEMPLATE POLICY_MAPPING_seq_tt[] = { | 89 | static const ASN1_TEMPLATE POLICY_MAPPING_seq_tt[] = { |