3 files changed, 72 insertions, 98 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index e9c549802d..ebca5ec5c5 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -640,65 +640,61 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
 /* NB these are sorted in pkey_id order, lowest first */
 
-const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = 
+const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = {
         {
+                .pkey_id = EVP_PKEY_DSA2,
+                .pkey_base_id = EVP_PKEY_DSA,
+                .pkey_flags = ASN1_PKEY_ALIAS
+        },
 
-                {
-                EVP_PKEY_DSA2,
-                EVP_PKEY_DSA,
-                ASN1_PKEY_ALIAS
-                },
-
-                {
-                EVP_PKEY_DSA1,
-                EVP_PKEY_DSA,
-                ASN1_PKEY_ALIAS
-                },
-
-                {
-                EVP_PKEY_DSA4,
-                EVP_PKEY_DSA,
-                ASN1_PKEY_ALIAS
-                },
+        {
+                .pkey_id = EVP_PKEY_DSA1,
+                .pkey_base_id = EVP_PKEY_DSA,
+                .pkey_flags = ASN1_PKEY_ALIAS
+        },
 
-                {
-                EVP_PKEY_DSA3,
-                EVP_PKEY_DSA,
-                ASN1_PKEY_ALIAS
-                },
+        {
+                .pkey_id = EVP_PKEY_DSA4,
+                .pkey_base_id = EVP_PKEY_DSA,
+                .pkey_flags = ASN1_PKEY_ALIAS
+        },
 
-                {
-                EVP_PKEY_DSA,
-                EVP_PKEY_DSA,
-                0,
-
-                "DSA",
-                "OpenSSL DSA method",
-
-                dsa_pub_decode,
-                dsa_pub_encode,
-                dsa_pub_cmp,
-                dsa_pub_print,
-
-                dsa_priv_decode,
-                dsa_priv_encode,
-                dsa_priv_print,
-
-                int_dsa_size,
-                dsa_bits,
-
-                dsa_param_decode,
-                dsa_param_encode,
-                dsa_missing_parameters,
-                dsa_copy_parameters,
-                dsa_cmp_parameters,
-                dsa_param_print,
-                dsa_sig_print,
-
-                int_dsa_free,
-                dsa_pkey_ctrl,
-                old_dsa_priv_decode,
-                old_dsa_priv_encode
-                }
-        };
+        {
+                .pkey_id = EVP_PKEY_DSA3,
+                .pkey_base_id = EVP_PKEY_DSA,
+                .pkey_flags = ASN1_PKEY_ALIAS
+        },
 
+        {
+                .pkey_id = EVP_PKEY_DSA,
+                .pkey_base_id = EVP_PKEY_DSA,
+
+                .pem_str = "DSA",
+                .info = "OpenSSL DSA method",
+
+                .pub_decode = dsa_pub_decode,
+                .pub_encode = dsa_pub_encode,
+                .pub_cmp = dsa_pub_cmp,
+                .pub_print = dsa_pub_print,
+
+                .priv_decode = dsa_priv_decode,
+                .priv_encode = dsa_priv_encode,
+                .priv_print = dsa_priv_print,
+
+                .pkey_size = int_dsa_size,
+                .pkey_bits = dsa_bits,
+
+                .param_decode = dsa_param_decode,
+                .param_encode = dsa_param_encode,
+                .param_missing = dsa_missing_parameters,
+                .param_copy = dsa_copy_parameters,
+                .param_cmp = dsa_cmp_parameters,
+                .param_print = dsa_param_print,
+                .sig_print = dsa_sig_print,
+
+                .pkey_free = int_dsa_free,
+                .pkey_ctrl = dsa_pkey_ctrl,
+                .old_priv_decode = old_dsa_priv_decode,
+                .old_priv_encode = old_dsa_priv_encode
+        }
+};
diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c
index b3d78e524c..7e0e3b006e 100644
--- a/src/lib/libcrypto/dsa/dsa_ossl.c
+++ b/src/lib/libcrypto/dsa/dsa_ossl.c
@@ -74,18 +74,12 @@ static int dsa_init(DSA *dsa);
 static int dsa_finish(DSA *dsa);
 
 static DSA_METHOD openssl_dsa_meth = {
-"OpenSSL DSA method",
-dsa_do_sign,
-dsa_sign_setup,
-dsa_do_verify,
-NULL, /* dsa_mod_exp, */
-NULL, /* dsa_bn_mod_exp, */
-dsa_init,
-dsa_finish,
-0,
-NULL,
-NULL,
-NULL
+        .name = "OpenSSL DSA method",
+        .dsa_do_sign = dsa_do_sign,
+        .dsa_sign_setup = dsa_sign_setup,
+        .dsa_do_verify = dsa_do_verify,
+        .init = dsa_init,
+        .finish = dsa_finish
 };
 
 /* These macro wrappers replace attempts to use the dsa_mod_exp() and
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index 7076bf7b67..4e77c6f64b 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -281,38 +281,22 @@ static int pkey_dsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         return DSA_generate_key(pkey->pkey.dsa);
         }
 
-const EVP_PKEY_METHOD dsa_pkey_meth = 
-        {
-        EVP_PKEY_DSA,
-        EVP_PKEY_FLAG_AUTOARGLEN,
-        pkey_dsa_init,
-        pkey_dsa_copy,
-        pkey_dsa_cleanup,
-
-        0,
-        pkey_dsa_paramgen,
-
-        0,
-        pkey_dsa_keygen,
-
-        0,
-        pkey_dsa_sign,
-
-        0,
-        pkey_dsa_verify,
-
-        0,0,
-
-        0,0,0,0,
+const EVP_PKEY_METHOD dsa_pkey_meth = {
+        .pkey_id = EVP_PKEY_DSA,
+        .flags = EVP_PKEY_FLAG_AUTOARGLEN,
 
-        0,0,
+        .init = pkey_dsa_init,
+        .copy = pkey_dsa_copy,
+        .cleanup = pkey_dsa_cleanup,
 
-        0,0,
+        .paramgen = pkey_dsa_paramgen,
 
-        0,0,
+        .keygen = pkey_dsa_keygen,
 
-        pkey_dsa_ctrl,
-        pkey_dsa_ctrl_str
+        .sign = pkey_dsa_sign,
 
+        .verify = pkey_dsa_verify,
 
-        };
+        .ctrl = pkey_dsa_ctrl,
+        .ctrl_str = pkey_dsa_ctrl_str
+};