From 6a72ca90e8e4257c1656bef69f6deeeac4ac3cb6 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 29 Jul 2015 16:13:49 +0000 Subject: Use named initialisers for X509V3_EXT_METHOD structs (for the usual reasons) - only change in generated assembly is due to line numbering. --- src/lib/libcrypto/x509v3/v3_pcons.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/lib/libcrypto/x509v3/v3_pcons.c') 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 @@ -/* $OpenBSD: v3_pcons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */ +/* $OpenBSD: v3_pcons.c,v 1.9 2015/07/29 16:13:49 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -72,14 +72,20 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); const X509V3_EXT_METHOD v3_policy_constraints = { - NID_policy_constraints, 0, - ASN1_ITEM_ref(POLICY_CONSTRAINTS), - 0, 0, 0, 0, - 0, 0, - i2v_POLICY_CONSTRAINTS, - v2i_POLICY_CONSTRAINTS, - NULL, NULL, - NULL + .ext_nid = NID_policy_constraints, + .ext_flags = 0, + .it = ASN1_ITEM_ref(POLICY_CONSTRAINTS), + .ext_new = NULL, + .ext_free = NULL, + .d2i = NULL, + .i2d = NULL, + .i2s = NULL, + .s2i = NULL, + .i2v = i2v_POLICY_CONSTRAINTS, + .v2i = v2i_POLICY_CONSTRAINTS, + .i2r = NULL, + .r2i = NULL, + .usr_data = NULL, }; static const ASN1_TEMPLATE POLICY_CONSTRAINTS_seq_tt[] = { -- cgit v1.2.3-55-g6feb