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, 31 insertions, 33 deletions

diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index 79dd11083e..0e6381f543 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -626,36 +626,34 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
         }
 
-const EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
-        {
-        EVP_PKEY_EC,
-        EVP_PKEY_EC,
-        0,
-        "EC",
-        "OpenSSL EC algorithm",
-
-        eckey_pub_decode,
-        eckey_pub_encode,
-        eckey_pub_cmp,
-        eckey_pub_print,
-
-        eckey_priv_decode,
-        eckey_priv_encode,
-        eckey_priv_print,
-
-        int_ec_size,
-        ec_bits,
-
-        eckey_param_decode,
-        eckey_param_encode,
-        ec_missing_parameters,
-        ec_copy_parameters,
-        ec_cmp_parameters,
-        eckey_param_print,
-        0,
-
-        int_ec_free,
-        ec_pkey_ctrl,
-        old_ec_priv_decode,
-        old_ec_priv_encode
-        };
+const EVP_PKEY_ASN1_METHOD eckey_asn1_meth = {
+        .pkey_id = EVP_PKEY_EC,
+        .pkey_base_id = EVP_PKEY_EC,
+
+        .pem_str = "EC",
+        .info = "OpenSSL EC algorithm",
+
+        .pub_decode = eckey_pub_decode,
+        .pub_encode = eckey_pub_encode,
+        .pub_cmp = eckey_pub_cmp,
+        .pub_print = eckey_pub_print,
+
+        .priv_decode = eckey_priv_decode,
+        .priv_encode = eckey_priv_encode,
+        .priv_print = eckey_priv_print,
+
+        .pkey_size = int_ec_size,
+        .pkey_bits = ec_bits,
+
+        .param_decode = eckey_param_decode,
+        .param_encode = eckey_param_encode,
+        .param_missing = ec_missing_parameters,
+        .param_copy = ec_copy_parameters,
+        .param_cmp = ec_cmp_parameters,
+        .param_print = eckey_param_print,
+
+        .pkey_free = int_ec_free,
+        .pkey_ctrl = ec_pkey_ctrl,
+        .old_priv_decode = old_ec_priv_decode,
+        .old_priv_encode = old_ec_priv_encode
+};