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, 5 insertions, 7 deletions

diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index d3be332f19..3b79ecaf02 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -157,13 +157,11 @@ static int noecho_console(UI *ui);
 static int close_console(UI *ui);
 
 static UI_METHOD ui_openssl = {
-        "OpenSSL default user interface",
-        open_console,
-        write_string,
-        NULL,                   /* No flusher is needed for command lines */
-        read_string,
-        close_console,
-        NULL
+        .name = "OpenSSL default user interface",
+        .ui_open_session = open_console,
+        .ui_write_string = write_string,
+        .ui_read_string = read_string,
+        .ui_close_session = close_console,
 };
 
 /* The method with all the built-in thingies */