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_file.c b/src/lib/libcrypto/bio/bss_file.c
index 6d5444f666..6f81a45a47 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -100,16 +100,15 @@ static int file_new(BIO *h);
 static int file_free(BIO *data);
 
 static BIO_METHOD methods_filep = {
-        BIO_TYPE_FILE,
-        "FILE pointer",
-        file_write,
-        file_read,
-        file_puts,
-        file_gets,
-        file_ctrl,
-        file_new,
-        file_free,
-        NULL,
+        .type = BIO_TYPE_FILE,
+        .name = "FILE pointer",
+        .bwrite = file_write,
+        .bread = file_read,
+        .bputs = file_puts,
+        .bgets = file_gets,
+        .ctrl = file_ctrl,
+        .create = file_new,
+        .destroy = file_free
 };
 
 BIO *