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@

2 files changed, 20 insertions, 49 deletions

diff --git a/src/lib/libcrypto/cmac/cm_ameth.c b/src/lib/libcrypto/cmac/cm_ameth.c
index 0b8e5670b0..c960e1cf43 100644
--- a/src/lib/libcrypto/cmac/cm_ameth.c
+++ b/src/lib/libcrypto/cmac/cm_ameth.c
@@ -73,25 +73,14 @@ static void cmac_key_free(EVP_PKEY *pkey)
                 CMAC_CTX_free(cmctx);
         }
 
-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,
+const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = {
+        .pkey_id = EVP_PKEY_CMAC,
+        .pkey_base_id = EVP_PKEY_CMAC,
 
-        cmac_size,
-        0,
-        0,0,0,0,0,0,0,
+        .pem_str = "CMAC",
+        .info = "OpenSSL CMAC method",
 
-        cmac_key_free,
-        0,
-        0,0
-        };
+        .pkey_size = cmac_size,
+        .pkey_free = cmac_key_free
+};
 
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c
index 00aa4d64d2..e1a00e90bb 100644
--- a/src/lib/libcrypto/cmac/cm_pmeth.c
+++ b/src/lib/libcrypto/cmac/cm_pmeth.c
@@ -188,37 +188,19 @@ static int pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx,
         return -2;
         }
 
-const EVP_PKEY_METHOD cmac_pkey_meth = 
-        {
-        EVP_PKEY_CMAC,
-        EVP_PKEY_FLAG_SIGCTX_CUSTOM,
-        pkey_cmac_init,
-        pkey_cmac_copy,
-        pkey_cmac_cleanup,
-
-        0, 0,
-
-        0,
-        pkey_cmac_keygen,
-
-        0, 0,
-
-        0, 0,
-
-        0,0,
-
-        cmac_signctx_init,
-        cmac_signctx,
-
-        0,0,
-
-        0,0,
+const EVP_PKEY_METHOD cmac_pkey_meth = {
+        .pkey_id = EVP_PKEY_CMAC,
+        .flags = EVP_PKEY_FLAG_SIGCTX_CUSTOM,
 
-        0,0,
+        .init = pkey_cmac_init,
+        .copy = pkey_cmac_copy,
+        .cleanup = pkey_cmac_cleanup,
 
-        0,0,
+        .keygen = pkey_cmac_keygen,
 
-        pkey_cmac_ctrl,
-        pkey_cmac_ctrl_str
+        .signctx_init = cmac_signctx_init,
+        .signctx = cmac_signctx,
 
-        };
+        .ctrl = pkey_cmac_ctrl,
+        .ctrl_str = pkey_cmac_ctrl_str
+};