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, 8 insertions, 10 deletions

diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 3dae2562bf..757e1dbb8f 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -74,16 +74,14 @@ static int sock_free(BIO *data);
 int BIO_sock_should_retry(int s);
 
 static BIO_METHOD methods_sockp = {
-        BIO_TYPE_SOCKET,
-        "socket",
-        sock_write,
-        sock_read,
-        sock_puts,
-        NULL, /* sock_gets, */
-        sock_ctrl,
-        sock_new,
-        sock_free,
-        NULL,
+        .type = BIO_TYPE_SOCKET,
+        .name = "socket",
+        .bwrite = sock_write,
+        .bread = sock_read,
+        .bputs = sock_puts,
+        .ctrl = sock_ctrl,
+        .create = sock_new,
+        .destroy = sock_free
 };
 
 BIO_METHOD *