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

diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
index 8fe9a45e48..3362c25768 100644
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ b/src/lib/libcrypto/evp/bio_enc.c
@@ -87,18 +87,16 @@ typedef struct enc_struct
         char buf[ENC_BLOCK_SIZE+BUF_OFFSET+2];
         } BIO_ENC_CTX;
 
-static BIO_METHOD methods_enc=
-        {
-        BIO_TYPE_CIPHER,"cipher",
-        enc_write,
-        enc_read,
-        NULL, /* enc_puts, */
-        NULL, /* enc_gets, */
-        enc_ctrl,
-        enc_new,
-        enc_free,
-        enc_callback_ctrl,
-        };
+static BIO_METHOD methods_enc= {
+        .type = BIO_TYPE_CIPHER,
+        .name = "cipher",
+        .bwrite = enc_write,
+        .bread = enc_read,
+        .ctrl = enc_ctrl,
+        .create = enc_new,
+        .destroy = enc_free,
+        .callback_ctrl = enc_callback_ctrl
+};
 
 BIO_METHOD *BIO_f_cipher(void)
         {