Use named initialisers for X509V3_EXT_METHOD structs (for the usual

reasons) - only change in generated assembly is due to line numbering.

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 @@
-/* $OpenBSD: v3_extku.c,v 1.12 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_extku.c,v 1.13 2015/07/29 16:13:48 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -69,26 +69,38 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(
     const X509V3_EXT_METHOD *method, void *eku, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD v3_ext_ku = {
-        NID_ext_key_usage, 0,
-        ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
-        0, 0, 0, 0,
-        0, 0,
-        i2v_EXTENDED_KEY_USAGE,
-        v2i_EXTENDED_KEY_USAGE,
-        0, 0,
-        NULL
+        .ext_nid = NID_ext_key_usage,
+        .ext_flags = 0,
+        .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
+        .ext_new = NULL,
+        .ext_free = NULL,
+        .d2i = NULL,
+        .i2d = NULL,
+        .i2s = NULL,
+        .s2i = NULL,
+        .i2v = i2v_EXTENDED_KEY_USAGE,
+        .v2i = v2i_EXTENDED_KEY_USAGE,
+        .i2r = NULL,
+        .r2i = NULL,
+        .usr_data = NULL,
 };
 
 /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
 const X509V3_EXT_METHOD v3_ocsp_accresp = {
-        NID_id_pkix_OCSP_acceptableResponses, 0,
-        ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
-        0, 0, 0, 0,
-        0, 0,
-        i2v_EXTENDED_KEY_USAGE,
-        v2i_EXTENDED_KEY_USAGE,
-        0, 0,
-        NULL
+        .ext_nid = NID_id_pkix_OCSP_acceptableResponses,
+        .ext_flags = 0,
+        .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
+        .ext_new = NULL,
+        .ext_free = NULL,
+        .d2i = NULL,
+        .i2d = NULL,
+        .i2s = NULL,
+        .s2i = NULL,
+        .i2v = i2v_EXTENDED_KEY_USAGE,
+        .v2i = v2i_EXTENDED_KEY_USAGE,
+        .i2r = NULL,
+        .r2i = NULL,
+        .usr_data = NULL,
 };
 
 static const ASN1_TEMPLATE EXTENDED_KEY_USAGE_item_tt = {