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_ok.c b/src/lib/libcrypto/evp/bio_ok.c
index 09a762ffac..d0bcbc2bef 100644
--- a/src/lib/libcrypto/evp/bio_ok.c
+++ b/src/lib/libcrypto/evp/bio_ok.c
@@ -157,18 +157,16 @@ typedef struct ok_struct
         unsigned char buf[IOBS];
         } BIO_OK_CTX;
 
-static BIO_METHOD methods_ok=
-        {
-        BIO_TYPE_CIPHER,"reliable",
-        ok_write,
-        ok_read,
-        NULL, /* ok_puts, */
-        NULL, /* ok_gets, */
-        ok_ctrl,
-        ok_new,
-        ok_free,
-        ok_callback_ctrl,
-        };
+static BIO_METHOD methods_ok = {
+        .type = BIO_TYPE_CIPHER,
+        .name = "reliable",
+        .bwrite = ok_write,
+        .bread = ok_read,
+        .ctrl = ok_ctrl,
+        .create = ok_new,
+        .destroy = ok_free,
+        .callback_ctrl = ok_callback_ctrl
+};
 
 BIO_METHOD *BIO_f_reliable(void)
         {