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, 9 deletions

diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index 8ea80f1f65..04a88a155b 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -79,15 +79,15 @@ static int fd_free(BIO *data);
 int BIO_fd_should_retry(int s);
 
 static BIO_METHOD methods_fdp = {
-        BIO_TYPE_FD, "file descriptor",
-        fd_write,
-        fd_read,
-        fd_puts,
-        fd_gets,
-        fd_ctrl,
-        fd_new,
-        fd_free,
-        NULL,
+        .type = BIO_TYPE_FD,
+        .name = "file descriptor",
+        .bwrite = fd_write,
+        .bread = fd_read,
+        .bputs = fd_puts,
+        .bgets = fd_gets,
+        .ctrl = fd_ctrl,
+        .create = fd_new,
+        .destroy = fd_free
 };
 
 BIO_METHOD *