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@

2 files changed, 12 insertions, 15 deletions

diff --git a/src/lib/libcrypto/asn1/bio_asn1.c b/src/lib/libcrypto/asn1/bio_asn1.c
index 36b82758ed..327355eeda 100644
--- a/src/lib/libcrypto/asn1/bio_asn1.c
+++ b/src/lib/libcrypto/asn1/bio_asn1.c
@@ -124,16 +124,16 @@ static int asn1_bio_setup_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
     asn1_bio_state_t other_state);
 
 static BIO_METHOD methods_asn1 = {
-        BIO_TYPE_ASN1,
-        "asn1",
-        asn1_bio_write,
-        asn1_bio_read,
-        asn1_bio_puts,
-        asn1_bio_gets,
-        asn1_bio_ctrl,
-        asn1_bio_new,
-        asn1_bio_free,
-        asn1_bio_callback_ctrl,
+        .type = BIO_TYPE_ASN1,
+        .name = "asn1",
+        .bwrite = asn1_bio_write,
+        .bread = asn1_bio_read,
+        .bputs = asn1_bio_puts,
+        .bgets = asn1_bio_gets,
+        .ctrl = asn1_bio_ctrl,
+        .create = asn1_bio_new,
+        .destroy = asn1_bio_free,
+        .callback_ctrl = asn1_bio_callback_ctrl
 };
 
 BIO_METHOD *
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index 674cca4a1c..097a39c4d1 100644
--- a/src/lib/libcrypto/asn1/x_crl.c
+++ b/src/lib/libcrypto/asn1/x_crl.c
@@ -78,11 +78,8 @@ static int def_crl_lookup(X509_CRL *crl, X509_REVOKED **ret,
     ASN1_INTEGER *serial, X509_NAME *issuer);
 
 static X509_CRL_METHOD int_crl_meth = {
-        0,
-        0,
-        0,
-        def_crl_lookup,
-        def_crl_verify
+        .crl_lookup = def_crl_lookup,
+        .crl_verify = def_crl_verify
 };
 
 static const X509_CRL_METHOD *default_crl_method = &int_crl_meth;