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_null.c b/src/lib/libcrypto/bio/bss_null.c
index c7289725d9..a5796ea87a 100644
--- a/src/lib/libcrypto/bio/bss_null.c
+++ b/src/lib/libcrypto/bio/bss_null.c
@@ -70,16 +70,15 @@ static int null_new(BIO *h);
 static int null_free(BIO *data);
 
 static BIO_METHOD null_method = {
-        BIO_TYPE_NULL,
-        "NULL",
-        null_write,
-        null_read,
-        null_puts,
-        null_gets,
-        null_ctrl,
-        null_new,
-        null_free,
-        NULL,
+        .type = BIO_TYPE_NULL,
+        .name = "NULL",
+        .bwrite = null_write,
+        .bread = null_read,
+        .bputs = null_puts,
+        .bgets = null_gets,
+        .ctrl = null_ctrl,
+        .create = null_new,
+        .destroy = null_free
 };
 
 BIO_METHOD *