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, 10 insertions, 20 deletions

diff --git a/src/lib/libcrypto/hmac/hm_ameth.c b/src/lib/libcrypto/hmac/hm_ameth.c
index fbada40d9c..0625b06651 100644
--- a/src/lib/libcrypto/hmac/hm_ameth.c
+++ b/src/lib/libcrypto/hmac/hm_ameth.c
@@ -138,30 +138,20 @@ static int old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
 
 #endif
 
-const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = 
-        {
-        EVP_PKEY_HMAC,
-        EVP_PKEY_HMAC,
-        0,
-
-        "HMAC",
-        "OpenSSL HMAC method",
-
-        0,0,0,0,
+const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
+        .pkey_id = EVP_PKEY_HMAC,
+        .pkey_base_id = EVP_PKEY_HMAC,
 
-        0,0,0,
+        .pem_str = "HMAC",
+        .info = "OpenSSL HMAC method",
 
-        hmac_size,
-        0,
-        0,0,0,0,0,0,0,
+        .pkey_size = hmac_size,
 
-        hmac_key_free,
-        hmac_pkey_ctrl,
+        .pkey_free = hmac_key_free,
+        .pkey_ctrl = hmac_pkey_ctrl,
 #ifdef HMAC_TEST_PRIVATE_KEY_FORMAT
-        old_hmac_decode,
-        old_hmac_encode
-#else
-        0,0
+        .old_priv_decode = old_hmac_decode,
+        .old_priv_encode = old_hmac_encode
 #endif
         };