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

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index dcf0c16a8f..845e28877e 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -128,22 +128,17 @@ static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
 static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx);
 static int RSA_eay_init(RSA *rsa);
 static int RSA_eay_finish(RSA *rsa);
-static RSA_METHOD rsa_pkcs1_eay_meth={
-        "Eric Young's PKCS#1 RSA",
-        RSA_eay_public_encrypt,
-        RSA_eay_public_decrypt, /* signature verification */
-        RSA_eay_private_encrypt, /* signing */
-        RSA_eay_private_decrypt,
-        RSA_eay_mod_exp,
-        BN_mod_exp_mont, /* XXX probably we should not use Montgomery if  e == 3 */
-        RSA_eay_init,
-        RSA_eay_finish,
-        0, /* flags */
-        NULL,
-        0, /* rsa_sign */
-        0, /* rsa_verify */
-        NULL /* rsa_keygen */
-        };
+static RSA_METHOD rsa_pkcs1_eay_meth = {
+        .name = "Eric Young's PKCS#1 RSA",
+        .rsa_pub_enc = RSA_eay_public_encrypt,
+        .rsa_pub_dec = RSA_eay_public_decrypt, /* signature verification */
+        .rsa_priv_enc = RSA_eay_private_encrypt, /* signing */
+        .rsa_priv_dec = RSA_eay_private_decrypt,
+        .rsa_mod_exp = RSA_eay_mod_exp,
+        .bn_mod_exp = BN_mod_exp_mont, /* XXX probably we should not use Montgomery if  e == 3 */
+        .init = RSA_eay_init,
+        .finish = RSA_eay_finish,
+};
 
 const RSA_METHOD *RSA_PKCS1_SSLeay(void)
         {