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

diff --git a/src/lib/libcrypto/rsa/rsa_null.c b/src/lib/libcrypto/rsa/rsa_null.c
index 2f2202f142..5b9317cb6c 100644
--- a/src/lib/libcrypto/rsa/rsa_null.c
+++ b/src/lib/libcrypto/rsa/rsa_null.c
@@ -82,22 +82,15 @@ static int RSA_null_mod_exp(const BIGNUM *r0, const BIGNUM *i, RSA *rsa);
 #endif
 static int RSA_null_init(RSA *rsa);
 static int RSA_null_finish(RSA *rsa);
-static RSA_METHOD rsa_null_meth={
-        "Null RSA",
-        RSA_null_public_encrypt,
-        RSA_null_public_decrypt,
-        RSA_null_private_encrypt,
-        RSA_null_private_decrypt,
-        NULL,
-        NULL,
-        RSA_null_init,
-        RSA_null_finish,
-        0,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-        };
+static RSA_METHOD rsa_null_meth = {
+        .name = "Null RSA",
+        .rsa_pub_enc = RSA_null_public_encrypt,
+        .rsa_pub_dec = RSA_null_public_decrypt,
+        .rsa_priv_enc = RSA_null_private_encrypt,
+        .rsa_priv_dec = RSA_null_private_decrypt,
+        .init = RSA_null_init,
+        .finish = RSA_null_finish,
+};
 
 const RSA_METHOD *RSA_null_method(void)
         {