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

diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c
index 3bba2afe98..7554ed9cf5 100644
--- a/src/lib/libcrypto/bio/bf_null.c
+++ b/src/lib/libcrypto/bio/bf_null.c
@@ -74,16 +74,16 @@ static int nullf_free(BIO *data);
 static long nullf_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 
 static BIO_METHOD methods_nullf = {
-        BIO_TYPE_NULL_FILTER,
-        "NULL filter",
-        nullf_write,
-        nullf_read,
-        nullf_puts,
-        nullf_gets,
-        nullf_ctrl,
-        nullf_new,
-        nullf_free,
-        nullf_callback_ctrl,
+        .type = BIO_TYPE_NULL_FILTER,
+        .name = "NULL filter",
+        .bwrite = nullf_write,
+        .bread = nullf_read,
+        .bputs = nullf_puts,
+        .bgets = nullf_gets,
+        .ctrl = nullf_ctrl,
+        .create = nullf_new,
+        .destroy = nullf_free,
+        .callback_ctrl = nullf_callback_ctrl
 };
 
 BIO_METHOD *