From eab708047a937230584142a2714d5293b2c20176 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 10 Jun 2014 14:14:07 +0000
Subject: Use C99 initialisers for EVP_MD structs, for clarity, grepability and
 to protect from future field reordering/removal.

No difference in generated assembly.
---
 src/lib/libcrypto/evp/m_dss1.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/lib/libcrypto/evp/m_dss1.c')

diff --git a/src/lib/libcrypto/evp/m_dss1.c b/src/lib/libcrypto/evp/m_dss1.c
index ec79cd7c8c..1583769142 100644
--- a/src/lib/libcrypto/evp/m_dss1.c
+++ b/src/lib/libcrypto/evp/m_dss1.c
@@ -87,18 +87,24 @@ final(EVP_MD_CTX *ctx, unsigned char *md)
 }
 
 static const EVP_MD dss1_md = {
-	NID_dsa,
-	NID_dsaWithSHA1,
-	SHA_DIGEST_LENGTH,
-	EVP_MD_FLAG_PKEY_DIGEST,
-	init,
-	update,
-	final,
-	NULL,
-	NULL,
-	EVP_PKEY_DSA_method,
-	SHA_CBLOCK,
-	sizeof(EVP_MD *) + sizeof(SHA_CTX),
+	.type = NID_dsa,
+	.pkey_type = NID_dsaWithSHA1,
+	.md_size = SHA_DIGEST_LENGTH,
+	.flags = EVP_MD_FLAG_PKEY_DIGEST,
+	.init = init,
+	.update = update,
+	.final = final,
+	.copy = NULL,
+	.cleanup = NULL,
+#ifndef OPENSSL_NO_DSA
+	.sign = (evp_sign_method *)DSA_sign,
+	.verify = (evp_verify_method *)DSA_verify,
+	.required_pkey_type = {
+	        EVP_PKEY_DSA, EVP_PKEY_DSA2, EVP_PKEY_DSA3, EVP_PKEY_DSA4, 0,
+	},
+#endif
+	.block_size = SHA_CBLOCK,
+	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA_CTX),
 };
 
 const EVP_MD *
-- 
cgit v1.2.3-55-g6feb