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/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index d787495a21..216d237b4d 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -106,18 +106,16 @@ typedef struct bio_ber_struct
         unsigned char buf[BER_BUF_SIZE];
         } BIO_BER_CTX;
 
-static BIO_METHOD methods_ber=
-        {
-        BIO_TYPE_CIPHER,"cipher",
-        ber_write,
-        ber_read,
-        NULL, /* ber_puts, */
-        NULL, /* ber_gets, */
-        ber_ctrl,
-        ber_new,
-        ber_free,
-        ber_callback_ctrl,
-        };
+static BIO_METHOD methods_ber = {
+        .type = BIO_TYPE_CIPHER,
+        .name = "cipher",
+        .bwrite = ber_write,
+        .bread = ber_read,
+        .ctrl = ber_ctrl,
+        .create = ber_new,
+        .destroy = ber_free,
+        .callback_ctrl = ber_callback_ctrl
+};
 
 BIO_METHOD *BIO_f_ber(void)
         {