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, 8 insertions, 10 deletions

diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 916af3cb20..943d3d9d96 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -98,16 +98,14 @@ static void BIO_ACCEPT_free(BIO_ACCEPT *a);
 #define ACPT_S_OK                       3
 
 static BIO_METHOD methods_acceptp = {
-        BIO_TYPE_ACCEPT,
-        "socket accept",
-        acpt_write,
-        acpt_read,
-        acpt_puts,
-        NULL, /* connect_gets, */
-        acpt_ctrl,
-        acpt_new,
-        acpt_free,
-        NULL,
+        .type = BIO_TYPE_ACCEPT,
+        .name = "socket accept",
+        .bwrite = acpt_write,
+        .bread = acpt_read,
+        .bputs = acpt_puts,
+        .ctrl = acpt_ctrl,
+        .create = acpt_new,
+        .destroy = acpt_free
 };
 
 BIO_METHOD *