1 files changed, 43 insertions, 18 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index 5b0dae2af6..4b3755e4e7 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.23 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.24 2015/07/29 16:13:48 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -74,27 +74,52 @@ static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
 
 const X509V3_EXT_METHOD v3_alt[] = {
         {
-                NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-                0, 0, 0, 0,
-                0, 0,
-                (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
-                (X509V3_EXT_V2I)v2i_subject_alt,
-                NULL, NULL, NULL
+                .ext_nid = NID_subject_alt_name,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(GENERAL_NAMES),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = NULL,
+                .s2i = NULL,
+                .i2v = (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+                .v2i = (X509V3_EXT_V2I)v2i_subject_alt,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
         },
         {
-                NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-                0, 0, 0, 0,
-                0, 0,
-                (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
-                (X509V3_EXT_V2I)v2i_issuer_alt,
-                NULL, NULL, NULL
+                .ext_nid = NID_issuer_alt_name,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(GENERAL_NAMES),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = NULL,
+                .s2i = NULL,
+                .i2v = (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+                .v2i = (X509V3_EXT_V2I)v2i_issuer_alt,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
         },
         {
-                NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-                0, 0, 0, 0,
-                0, 0,
-                (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
-                NULL, NULL, NULL, NULL
+                .ext_nid = NID_certificate_issuer,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(GENERAL_NAMES),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = NULL,
+                .s2i = NULL,
+                .i2v = (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
         },
 };