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_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index 99be1a629e..e96da40a58 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -72,16 +72,16 @@ static long buffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 #define DEFAULT_BUFFER_SIZE     4096
 
 static BIO_METHOD methods_buffer = {
-        BIO_TYPE_BUFFER,
-        "buffer",
-        buffer_write,
-        buffer_read,
-        buffer_puts,
-        buffer_gets,
-        buffer_ctrl,
-        buffer_new,
-        buffer_free,
-        buffer_callback_ctrl,
+        .type = BIO_TYPE_BUFFER,
+        .name = "buffer",
+        .bwrite = buffer_write,
+        .bread = buffer_read,
+        .bputs = buffer_puts,
+        .bgets = buffer_gets,
+        .ctrl = buffer_ctrl,
+        .create = buffer_new,
+        .destroy = buffer_free,
+        .callback_ctrl = buffer_callback_ctrl
 };
 
 BIO_METHOD *