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_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index 048e6892cc..5a0f6b276a 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -81,16 +81,16 @@ typedef struct nbio_test_st {
 } NBIO_TEST;
 
 static BIO_METHOD methods_nbiof = {
-        BIO_TYPE_NBIO_TEST,
-        "non-blocking IO test filter",
-        nbiof_write,
-        nbiof_read,
-        nbiof_puts,
-        nbiof_gets,
-        nbiof_ctrl,
-        nbiof_new,
-        nbiof_free,
-        nbiof_callback_ctrl,
+        .type = BIO_TYPE_NBIO_TEST,
+        .name = "non-blocking IO test filter",
+        .bwrite = nbiof_write,
+        .bread = nbiof_read,
+        .bputs = nbiof_puts,
+        .bgets = nbiof_gets,
+        .ctrl = nbiof_ctrl,
+        .create = nbiof_new,
+        .destroy = nbiof_free,
+        .callback_ctrl = nbiof_callback_ctrl
 };
 
 BIO_METHOD *