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, 11 insertions, 12 deletions

diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
index 144fdfd56a..85eead6c95 100644
--- a/src/lib/libcrypto/evp/bio_md.c
+++ b/src/lib/libcrypto/evp/bio_md.c
@@ -74,18 +74,17 @@ static int md_new(BIO *h);
 static int md_free(BIO *data);
 static long md_callback_ctrl(BIO *h,int cmd,bio_info_cb *fp);
 
-static BIO_METHOD methods_md=
-        {
-        BIO_TYPE_MD,"message digest",
-        md_write,
-        md_read,
-        NULL, /* md_puts, */
-        md_gets,
-        md_ctrl,
-        md_new,
-        md_free,
-        md_callback_ctrl,
-        };
+static BIO_METHOD methods_md = {
+        .type = BIO_TYPE_MD,
+        .name = "message digest",
+        .bwrite = md_write,
+        .bread = md_read,
+        .bgets = md_gets,
+        .ctrl = md_ctrl,
+        .create = md_new,
+        .destroy = md_free,
+        .callback_ctrl = md_callback_ctrl
+};
 
 BIO_METHOD *BIO_f_md(void)
         {