From c58ba0cb9f863147ad48ac1ae1d36fb3fc1cef10 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 5 Oct 2022 18:14:12 +0200 Subject: [PATCH] openssl: Remove unused openssl_hash_chunk() helper Was used by the ECDSA implementation before 293a912c7de6 ("openssl: Fixes for ECDSA with OpenSSL 3.0"). --- .../plugins/openssl/openssl_util.c | 45 ------------------- .../plugins/openssl/openssl_util.h | 12 ----- 2 files changed, 57 deletions(-) diff --git a/src/libstrongswan/plugins/openssl/openssl_util.c b/src/libstrongswan/plugins/openssl/openssl_util.c index 6c12c89c2..d08b2f4b6 100644 --- a/src/libstrongswan/plugins/openssl/openssl_util.c +++ b/src/libstrongswan/plugins/openssl/openssl_util.c @@ -129,51 +129,6 @@ bool openssl_fingerprint(EVP_PKEY *key, cred_encoding_type_t type, chunk_t *fp) return TRUE; } -/** - * Described in header. - */ -bool openssl_hash_chunk(int hash_type, chunk_t data, chunk_t *hash) -{ - EVP_MD_CTX *ctx; - bool ret = FALSE; - const EVP_MD *hasher = EVP_get_digestbynid(hash_type); - if (!hasher) - { - return FALSE; - } - - ctx = EVP_MD_CTX_create(); - if (!ctx) - { - goto error; - } - - if (!EVP_DigestInit_ex(ctx, hasher, NULL)) - { - goto error; - } - - if (!EVP_DigestUpdate(ctx, data.ptr, data.len)) - { - goto error; - } - - *hash = chunk_alloc(EVP_MD_size(hasher)); - if (!EVP_DigestFinal_ex(ctx, hash->ptr, NULL)) - { - chunk_free(hash); - goto error; - } - - ret = TRUE; -error: - if (ctx) - { - EVP_MD_CTX_destroy(ctx); - } - return ret; -} - /** * Described in header. */ diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h index dc33070b7..dbed0fab9 100644 --- a/src/libstrongswan/plugins/openssl/openssl_util.h +++ b/src/libstrongswan/plugins/openssl/openssl_util.h @@ -57,18 +57,6 @@ bool openssl_compute_shared_key(EVP_PKEY *priv, EVP_PKEY *pub, chunk_t *shared); */ bool openssl_fingerprint(EVP_PKEY *key, cred_encoding_type_t type, chunk_t *fp); -/** - * Creates a hash of a given type of a chunk of data. - * - * Note: this function allocates memory for the hash - * - * @param hash_type NID of the hash - * @param data the chunk of data to hash - * @param hash chunk that contains the hash - * @return TRUE on success, FALSE otherwise - */ -bool openssl_hash_chunk(int hash_type, chunk_t data, chunk_t *hash); - /** * Concatenates two bignums into a chunk, thereby enforcing the length of * a single BIGNUM, if necessary, by pre-pending it with zeros.