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

diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 1a477c12be..b147a8eccb 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -70,16 +70,15 @@ static int mem_new(BIO *h);
 static int mem_free(BIO *data);
 
 static BIO_METHOD mem_method = {
-        BIO_TYPE_MEM,
-        "memory buffer",
-        mem_write,
-        mem_read,
-        mem_puts,
-        mem_gets,
-        mem_ctrl,
-        mem_new,
-        mem_free,
-        NULL,
+        .type = BIO_TYPE_MEM,
+        .name = "memory buffer",
+        .bwrite = mem_write,
+        .bread = mem_read,
+        .bputs = mem_puts,
+        .bgets = mem_gets,
+        .ctrl = mem_ctrl,
+        .create = mem_new,
+        .destroy = mem_free
 };
 
 /* bio->num is used to hold the value to return on 'empty', if it is