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

diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index 6aa2d8b0a4..ac1cbc5087 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -86,15 +86,13 @@ static void xsyslog(BIO* bp, int priority, const char* string);
 static void xcloselog(BIO* bp);
 
 static BIO_METHOD methods_slg = {
-        BIO_TYPE_MEM, "syslog",
-        slg_write,
-        NULL,
-        slg_puts,
-        NULL,
-        slg_ctrl,
-        slg_new,
-        slg_free,
-        NULL,
+        .type = BIO_TYPE_MEM,
+        .name = "syslog",
+        .bwrite = slg_write,
+        .bputs = slg_puts,
+        .ctrl = slg_ctrl,
+        .create = slg_new,
+        .destroy = slg_free
 };
 
 BIO_METHOD *