Use C99 initializers for the various FOO_METHOD structs. More readable, and

avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
        {
        EVP_PKEY_CMAC,
        EVP_PKEY_CMAC,
        0,

        "CMAC",
        "OpenSSL CMAC method",

        0,0,0,0,

        0,0,0,

        cmac_size,
        0,
        0,0,0,0,0,0,0,

        cmac_key_free,
        0,
        0,0
        };

ok matthew@ deraadt@

1 files changed, 3 insertions, 31 deletions

diff --git a/src/lib/libcrypto/engine/hw_cryptodev.c b/src/lib/libcrypto/engine/hw_cryptodev.c
index 190dcc4f75..9b24511b69 100644
--- a/src/lib/libcrypto/engine/hw_cryptodev.c
+++ b/src/lib/libcrypto/engine/hw_cryptodev.c
@@ -1039,19 +1039,7 @@ err:
 }
 
 static RSA_METHOD cryptodev_rsa = {
-        "cryptodev RSA method",
-        NULL,                           /* rsa_pub_enc */
-        NULL,                           /* rsa_pub_dec */
-        NULL,                           /* rsa_priv_enc */
-        NULL,                           /* rsa_priv_dec */
-        NULL,
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,                              /* flags */
-        NULL,                           /* app_data */
-        NULL,                           /* rsa_sign */
-        NULL                            /* rsa_verify */
+        .name = "cryptodev RSA method"
 };
 
 static int
@@ -1181,16 +1169,7 @@ err:
 }
 
 static DSA_METHOD cryptodev_dsa = {
-        "cryptodev DSA method",
-        NULL,
-        NULL,                           /* dsa_sign_setup */
-        NULL,
-        NULL,                           /* dsa_mod_exp */
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,      /* flags */
-        NULL    /* app_data */
+        .name = "cryptodev DSA method"
 };
 
 static int
@@ -1244,14 +1223,7 @@ err:
 }
 
 static DH_METHOD cryptodev_dh = {
-        "cryptodev DH method",
-        NULL,                           /* cryptodev_dh_generate_key */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        0,      /* flags */
-        NULL    /* app_data */
+        .name = "cryptodev DH method"
 };
 
 /*