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_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c
index f0bd0d709e..54c370d038 100644
--- a/src/lib/libcrypto/bio/bf_lbuf.c
+++ b/src/lib/libcrypto/bio/bf_lbuf.c
@@ -77,16 +77,16 @@ static long linebuffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 /* #define DEBUG */
 
 static BIO_METHOD methods_linebuffer = {
-        BIO_TYPE_LINEBUFFER,
-        "linebuffer",
-        linebuffer_write,
-        linebuffer_read,
-        linebuffer_puts,
-        linebuffer_gets,
-        linebuffer_ctrl,
-        linebuffer_new,
-        linebuffer_free,
-        linebuffer_callback_ctrl,
+        .type = BIO_TYPE_LINEBUFFER,
+        .name = "linebuffer",
+        .bwrite = linebuffer_write,
+        .bread = linebuffer_read,
+        .bputs = linebuffer_puts,
+        .bgets = linebuffer_gets,
+        .ctrl = linebuffer_ctrl,
+        .create = linebuffer_new,
+        .destroy = linebuffer_free,
+        .callback_ctrl = linebuffer_callback_ctrl
 };
 
 BIO_METHOD *