diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_ncons.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_ncons.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_ncons.c b/src/lib/libcrypto/x509v3/v3_ncons.c index 22b9cfc683..2af15726a8 100644 --- a/src/lib/libcrypto/x509v3/v3_ncons.c +++ b/src/lib/libcrypto/x509v3/v3_ncons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_ncons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */ | 1 | /* $OpenBSD: v3_ncons.c,v 1.9 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. | 3 | * project. |
4 | */ | 4 | */ |
@@ -80,13 +80,20 @@ static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml); | |||
80 | static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base); | 80 | static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base); |
81 | 81 | ||
82 | const X509V3_EXT_METHOD v3_name_constraints = { | 82 | const X509V3_EXT_METHOD v3_name_constraints = { |
83 | NID_name_constraints, 0, | 83 | .ext_nid = NID_name_constraints, |
84 | ASN1_ITEM_ref(NAME_CONSTRAINTS), | 84 | .ext_flags = 0, |
85 | 0, 0, 0, 0, | 85 | .it = ASN1_ITEM_ref(NAME_CONSTRAINTS), |
86 | 0, 0, | 86 | .ext_new = NULL, |
87 | 0, v2i_NAME_CONSTRAINTS, | 87 | .ext_free = NULL, |
88 | i2r_NAME_CONSTRAINTS, 0, | 88 | .d2i = NULL, |
89 | NULL | 89 | .i2d = NULL, |
90 | .i2s = NULL, | ||
91 | .s2i = NULL, | ||
92 | .i2v = NULL, | ||
93 | .v2i = v2i_NAME_CONSTRAINTS, | ||
94 | .i2r = i2r_NAME_CONSTRAINTS, | ||
95 | .r2i = NULL, | ||
96 | .usr_data = NULL, | ||
90 | }; | 97 | }; |
91 | 98 | ||
92 | static const ASN1_TEMPLATE GENERAL_SUBTREE_seq_tt[] = { | 99 | static const ASN1_TEMPLATE GENERAL_SUBTREE_seq_tt[] = { |