diff options
| author | jsing <> | 2014-06-10 14:14:07 +0000 |
|---|---|---|
| committer | jsing <> | 2014-06-10 14:14:07 +0000 |
| commit | ffd82070bf98c0a547b663e6bb65795c86d44d08 (patch) | |
| tree | e21d427847fe0052e8aaa1f761714867b6e0e12d /src/lib/libcrypto/evp/m_ecdsa.c | |
| parent | c89ad5d60e5c36f87b2d7d346af77973e9201dd0 (diff) | |
| download | openbsd-ffd82070bf98c0a547b663e6bb65795c86d44d08.tar.gz openbsd-ffd82070bf98c0a547b663e6bb65795c86d44d08.tar.bz2 openbsd-ffd82070bf98c0a547b663e6bb65795c86d44d08.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_ecdsa.c')
| -rw-r--r-- | src/lib/libcrypto/evp/m_ecdsa.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/lib/libcrypto/evp/m_ecdsa.c b/src/lib/libcrypto/evp/m_ecdsa.c index a2dc889b86..47ffec1752 100644 --- a/src/lib/libcrypto/evp/m_ecdsa.c +++ b/src/lib/libcrypto/evp/m_ecdsa.c | |||
| @@ -136,18 +136,24 @@ final(EVP_MD_CTX *ctx, unsigned char *md) | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | static const EVP_MD ecdsa_md = { | 138 | static const EVP_MD ecdsa_md = { |
| 139 | NID_ecdsa_with_SHA1, | 139 | .type = NID_ecdsa_with_SHA1, |
| 140 | NID_ecdsa_with_SHA1, | 140 | .pkey_type = NID_ecdsa_with_SHA1, |
| 141 | SHA_DIGEST_LENGTH, | 141 | .md_size = SHA_DIGEST_LENGTH, |
| 142 | EVP_MD_FLAG_PKEY_DIGEST, | 142 | .flags = EVP_MD_FLAG_PKEY_DIGEST, |
| 143 | init, | 143 | .init = init, |
| 144 | update, | 144 | .update = update, |
| 145 | final, | 145 | .final = final, |
| 146 | NULL, | 146 | .copy = NULL, |
| 147 | NULL, | 147 | .cleanup = NULL, |
| 148 | EVP_PKEY_ECDSA_method, | 148 | #ifndef OPENSSL_NO_ECDSA |
| 149 | SHA_CBLOCK, | 149 | .sign = (evp_sign_method *)ECDSA_sign, |
| 150 | sizeof(EVP_MD *) + sizeof(SHA_CTX), | 150 | .verify = (evp_verify_method *)ECDSA_verify, |
| 151 | .required_pkey_type = { | ||
| 152 | EVP_PKEY_EC, 0, 0, 0, | ||
| 153 | }, | ||
| 154 | #endif | ||
| 155 | .block_size = SHA_CBLOCK, | ||
| 156 | .ctx_size = sizeof(EVP_MD *) + sizeof(SHA_CTX), | ||
| 151 | }; | 157 | }; |
| 152 | 158 | ||
| 153 | const EVP_MD * | 159 | const EVP_MD * |
