diff options
author | jsing <> | 2014-06-10 14:14:07 +0000 |
---|---|---|
committer | jsing <> | 2014-06-10 14:14:07 +0000 |
commit | eab708047a937230584142a2714d5293b2c20176 (patch) | |
tree | e21d427847fe0052e8aaa1f761714867b6e0e12d /src/lib/libcrypto/evp/m_md4.c | |
parent | 4067b1a94cae473804f9b1319a455ac636387cbd (diff) | |
download | openbsd-eab708047a937230584142a2714d5293b2c20176.tar.gz openbsd-eab708047a937230584142a2714d5293b2c20176.tar.bz2 openbsd-eab708047a937230584142a2714d5293b2c20176.zip |
Use C99 initialisers for EVP_MD structs, for clarity, grepability and to
protect from future field reordering/removal.
No difference in generated assembly.
Diffstat (limited to 'src/lib/libcrypto/evp/m_md4.c')
-rw-r--r-- | src/lib/libcrypto/evp/m_md4.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/lib/libcrypto/evp/m_md4.c b/src/lib/libcrypto/evp/m_md4.c index 9d7dda26f3..6f9acd9075 100644 --- a/src/lib/libcrypto/evp/m_md4.c +++ b/src/lib/libcrypto/evp/m_md4.c | |||
@@ -90,18 +90,24 @@ final(EVP_MD_CTX *ctx, unsigned char *md) | |||
90 | } | 90 | } |
91 | 91 | ||
92 | static const EVP_MD md4_md = { | 92 | static const EVP_MD md4_md = { |
93 | NID_md4, | 93 | .type = NID_md4, |
94 | NID_md4WithRSAEncryption, | 94 | .pkey_type = NID_md4WithRSAEncryption, |
95 | MD4_DIGEST_LENGTH, | 95 | .md_size = MD4_DIGEST_LENGTH, |
96 | 0, | 96 | .flags = 0, |
97 | init, | 97 | .init = init, |
98 | update, | 98 | .update = update, |
99 | final, | 99 | .final = final, |
100 | NULL, | 100 | .copy = NULL, |
101 | NULL, | 101 | .cleanup = NULL, |
102 | EVP_PKEY_RSA_method, | 102 | #ifndef OPENSSL_NO_RSA |
103 | MD4_CBLOCK, | 103 | .sign = (evp_sign_method *)RSA_sign, |
104 | sizeof(EVP_MD *) + sizeof(MD4_CTX), | 104 | .verify = (evp_verify_method *)RSA_verify, |
105 | .required_pkey_type = { | ||
106 | EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0, | ||
107 | }, | ||
108 | #endif | ||
109 | .block_size = MD4_CBLOCK, | ||
110 | .ctx_size = sizeof(EVP_MD *) + sizeof(MD4_CTX), | ||
105 | }; | 111 | }; |
106 | 112 | ||
107 | const EVP_MD * | 113 | const EVP_MD * |