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

diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index 7725935610..4a6e04e946 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -69,16 +69,10 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
                 const ECDSA_SIG *sig, EC_KEY *eckey);
 
 static ECDSA_METHOD openssl_ecdsa_meth = {
-        "OpenSSL ECDSA method",
-        ecdsa_do_sign,
-        ecdsa_sign_setup,
-        ecdsa_do_verify,
-#if 0
-        NULL, /* init     */
-        NULL, /* finish   */
-#endif
-        0,    /* flags    */
-        NULL  /* app_data */
+        .name = "OpenSSL ECDSA method",
+        .ecdsa_do_sign = ecdsa_do_sign,
+        .ecdsa_sign_setup = ecdsa_sign_setup,
+        .ecdsa_do_verify = ecdsa_do_verify
 };
 
 const ECDSA_METHOD *ECDSA_OpenSSL(void)