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_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index d31e59872e..1a17cdf275 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -94,16 +94,14 @@ static int bio_make_pair(BIO *bio1, BIO *bio2);
 static void bio_destroy_pair(BIO *bio);
 
 static BIO_METHOD methods_biop = {
-        BIO_TYPE_BIO,
-        "BIO pair",
-        bio_write,
-        bio_read,
-        bio_puts,
-        NULL /* no bio_gets */,
-        bio_ctrl,
-        bio_new,
-        bio_free,
-        NULL /* no bio_callback_ctrl */
+        .type = BIO_TYPE_BIO,
+        .name = "BIO pair",
+        .bwrite = bio_write,
+        .bread = bio_read,
+        .bputs = bio_puts,
+        .ctrl = bio_ctrl,
+        .create = bio_new,
+        .destroy = bio_free
 };
 
 BIO_METHOD *