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, 6 insertions, 16 deletions

diff --git a/src/lib/libcrypto/engine/eng_rsax.c b/src/lib/libcrypto/engine/eng_rsax.c
index fa9159499d..c0f6851601 100644
--- a/src/lib/libcrypto/engine/eng_rsax.c
+++ b/src/lib/libcrypto/engine/eng_rsax.c
@@ -116,22 +116,12 @@ static const ENGINE_CMD_DEFN e_rsax_cmd_defns[] = {
 
 #ifndef OPENSSL_NO_RSA
 /* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD e_rsax_rsa =
-        {
-        "Intel RSA-X method",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        e_rsax_rsa_mod_exp,
-        NULL,
-        NULL,
-        e_rsax_rsa_finish,
-        RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE,
-        NULL,
-        NULL,
-        NULL
-        };
+static RSA_METHOD e_rsax_rsa = {
+        .name = "Intel RSA-X method",
+        .rsa_mod_exp = e_rsax_rsa_mod_exp,
+        .finish = e_rsax_rsa_finish,
+        .flags = RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE,
+};
 #endif
 
 /* Constants used when creating the ENGINE */