The direct $HASH_{Init,Update,Final} has been discouraged for a while. With the upcoming OpenSSL 3.0 it will be officially deprecated.
Add a handy macro, to avoid repetition and mistakes like in the current code. Namely - we're using SHA cblock/digest_len for md5 :-\
The macro will also make it easier to add more, as seen with next patch.
Signed-off-by: Emil Velikov emil.l.velikov@gmail.com --- examples/nettle-openssl.c | 109 ++++++++++++++------------------------ 1 file changed, 40 insertions(+), 69 deletions(-)
diff --git a/examples/nettle-openssl.c b/examples/nettle-openssl.c index bb2e6627..19da06fd 100644 --- a/examples/nettle-openssl.c +++ b/examples/nettle-openssl.c @@ -383,76 +383,47 @@ nettle_openssl_cast128 = {
/* Hash functions */
-/* md5 */ -static nettle_hash_init_func openssl_md5_init; -static void -openssl_md5_init(void *ctx) -{ - MD5_Init(ctx); -} - -static nettle_hash_update_func openssl_md5_update; -static void -openssl_md5_update(void *ctx, - size_t length, - const uint8_t *src) -{ - MD5_Update(ctx, src, length); -} - -static nettle_hash_digest_func openssl_md5_digest; -static void -openssl_md5_digest(void *ctx, - size_t length, uint8_t *dst) -{ - assert(length == SHA_DIGEST_LENGTH); - MD5_Final(dst, ctx); - MD5_Init(ctx); -} - -const struct nettle_hash -nettle_openssl_md5 = { - "openssl md5", sizeof(SHA_CTX), - SHA_DIGEST_LENGTH, SHA_CBLOCK, - openssl_md5_init, - openssl_md5_update, - openssl_md5_digest +#define OPENSSL_HASH(NAME, name) \ +static nettle_hash_init_func openssl_##name##_init; \ +static void \ +openssl_##name##_init(void *ctx) \ +{ \ + if ((*(EVP_MD_CTX **)ctx = EVP_MD_CTX_new()) == NULL) \ + return; \ + \ + EVP_DigestInit(*(EVP_MD_CTX **)ctx, EVP_##name()); \ +} \ + \ +static nettle_hash_update_func openssl_##name##_update; \ +static void \ +openssl_##name##_update(void *ctx, \ + size_t length, \ + const uint8_t *src) \ +{ \ + EVP_DigestUpdate(*(EVP_MD_CTX **)ctx, src, length); \ +} \ + \ +static nettle_hash_digest_func openssl_##name##_digest; \ +static void \ +openssl_##name##_digest(void *ctx, \ + size_t length, uint8_t *dst) \ +{ \ + assert(length == NAME##_DIGEST_LENGTH); \ + \ + EVP_DigestFinal(*(EVP_MD_CTX **)ctx, dst, NULL); \ + EVP_DigestInit(*(EVP_MD_CTX **)ctx, EVP_##name()); \ +} \ + \ +const struct nettle_hash \ +nettle_openssl_##name = { \ + "openssl " #name, sizeof(NAME##_CTX), \ + NAME##_DIGEST_LENGTH, NAME##_CBLOCK, \ + openssl_##name##_init, \ + openssl_##name##_update, \ + openssl_##name##_digest \ };
-/* sha1 */ -static nettle_hash_init_func openssl_sha1_init; -static void -openssl_sha1_init(void *ctx) -{ - SHA1_Init(ctx); -} - -static nettle_hash_update_func openssl_sha1_update; -static void -openssl_sha1_update(void *ctx, - size_t length, - const uint8_t *src) -{ - SHA1_Update(ctx, src, length); -} - -static nettle_hash_digest_func openssl_sha1_digest; -static void -openssl_sha1_digest(void *ctx, - size_t length, uint8_t *dst) -{ - assert(length == SHA_DIGEST_LENGTH); - SHA1_Final(dst, ctx); - SHA1_Init(ctx); -} +OPENSSL_HASH(MD5, md5) +OPENSSL_HASH(SHA, sha1)
-const struct nettle_hash -nettle_openssl_sha1 = { - "openssl sha1", sizeof(SHA_CTX), - SHA_DIGEST_LENGTH, SHA_CBLOCK, - openssl_sha1_init, - openssl_sha1_update, - openssl_sha1_digest -}; - #endif /* WITH_OPENSSL */