diff options
author | jsing <> | 2015-07-29 16:13:49 +0000 |
---|---|---|
committer | jsing <> | 2015-07-29 16:13:49 +0000 |
commit | 6a72ca90e8e4257c1656bef69f6deeeac4ac3cb6 (patch) | |
tree | af66362d049ee3d67f52261defee582a9529f2d0 /src/lib/libcrypto/x509v3/v3_pcons.c | |
parent | 4b2596fb0f28cb59c8918b16cdae591454312175 (diff) | |
download | openbsd-6a72ca90e8e4257c1656bef69f6deeeac4ac3cb6.tar.gz openbsd-6a72ca90e8e4257c1656bef69f6deeeac4ac3cb6.tar.bz2 openbsd-6a72ca90e8e4257c1656bef69f6deeeac4ac3cb6.zip |
Use named initialisers for X509V3_EXT_METHOD structs (for the usual
reasons) - only change in generated assembly is due to line numbering.
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_pcons.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_pcons.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_pcons.c b/src/lib/libcrypto/x509v3/v3_pcons.c index 03193427f7..a5a8d8a025 100644 --- a/src/lib/libcrypto/x509v3/v3_pcons.c +++ b/src/lib/libcrypto/x509v3/v3_pcons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_pcons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pcons.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 | */ |
@@ -72,14 +72,20 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, | |||
72 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); | 72 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); |
73 | 73 | ||
74 | const X509V3_EXT_METHOD v3_policy_constraints = { | 74 | const X509V3_EXT_METHOD v3_policy_constraints = { |
75 | NID_policy_constraints, 0, | 75 | .ext_nid = NID_policy_constraints, |
76 | ASN1_ITEM_ref(POLICY_CONSTRAINTS), | 76 | .ext_flags = 0, |
77 | 0, 0, 0, 0, | 77 | .it = ASN1_ITEM_ref(POLICY_CONSTRAINTS), |
78 | 0, 0, | 78 | .ext_new = NULL, |
79 | i2v_POLICY_CONSTRAINTS, | 79 | .ext_free = NULL, |
80 | v2i_POLICY_CONSTRAINTS, | 80 | .d2i = NULL, |
81 | NULL, NULL, | 81 | .i2d = NULL, |
82 | NULL | 82 | .i2s = NULL, |
83 | .s2i = NULL, | ||
84 | .i2v = i2v_POLICY_CONSTRAINTS, | ||
85 | .v2i = v2i_POLICY_CONSTRAINTS, | ||
86 | .i2r = NULL, | ||
87 | .r2i = NULL, | ||
88 | .usr_data = NULL, | ||
83 | }; | 89 | }; |
84 | 90 | ||
85 | static const ASN1_TEMPLATE POLICY_CONSTRAINTS_seq_tt[] = { | 91 | static const ASN1_TEMPLATE POLICY_CONSTRAINTS_seq_tt[] = { |