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, 1 insertions, 17 deletions

diff --git a/src/lib/libcrypto/dso/dso_null.c b/src/lib/libcrypto/dso/dso_null.c
index 0c877ab2f2..c9f4226cb5 100644
--- a/src/lib/libcrypto/dso/dso_null.c
+++ b/src/lib/libcrypto/dso/dso_null.c
@@ -64,23 +64,7 @@
 #include <openssl/dso.h>
 
 static DSO_METHOD dso_meth_null = {
-        "NULL shared library method",
-        NULL, /* load */
-        NULL, /* unload */
-        NULL, /* bind_var */
-        NULL, /* bind_func */
-/* For now, "unbind" doesn't exist */
-#if 0
-        NULL, /* unbind_var */
-        NULL, /* unbind_func */
-#endif
-        NULL, /* ctrl */
-        NULL, /* dso_name_converter */
-        NULL, /* dso_merger */
-        NULL, /* init */
-        NULL, /* finish */
-        NULL, /* pathbyaddr */
-        NULL  /* globallookup */
+        .name = "NULL shared library method"
 };
 
 DSO_METHOD *