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

diff --git a/src/lib/libcrypto/engine/eng_rdrand.c b/src/lib/libcrypto/engine/eng_rdrand.c
index 4e9e91d54b..ba1b5bfbff 100644
--- a/src/lib/libcrypto/engine/eng_rdrand.c
+++ b/src/lib/libcrypto/engine/eng_rdrand.c
@@ -84,15 +84,11 @@ static int get_random_bytes (unsigned char *buf, int num)
 static int random_status (void)
 {       return 1;       }
 
-static RAND_METHOD rdrand_meth =
-        {
-        NULL,   /* seed */
-        get_random_bytes,
-        NULL,   /* cleanup */
-        NULL,   /* add */
-        get_random_bytes,
-        random_status,
-        };
+static RAND_METHOD rdrand_meth = {
+        .bytes = get_random_bytes,
+        .pseudorand = get_random_bytes,
+        .status = random_status
+};
 
 static int rdrand_init(ENGINE *e)
 {       return 1;       }