From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Oct 2025 07:19:47 +0000 (+0900)
Subject: openssl-util: drop unused string_hashsum() and friends when OpenSSL is disabled
X-Git-Tag: v259-rc1~186^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab9b3bec6a00e847c5bca2449c5baf5841251a11;p=thirdparty%2Fsystemd.git

openssl-util: drop unused string_hashsum() and friends when OpenSSL is disabled
---

diff --git a/src/shared/openssl-util.h b/src/shared/openssl-util.h
index 0084d62fe02..f7f452cead3 100644
--- a/src/shared/openssl-util.h
+++ b/src/shared/openssl-util.h
@@ -170,6 +170,12 @@ int digest_and_sign(const EVP_MD *md, EVP_PKEY *privkey, const void *data, size_
 int pkcs7_new(X509 *certificate, EVP_PKEY *private_key, const char *hash_algorithm, PKCS7 **ret_p7, PKCS7_SIGNER_INFO **ret_si);
 
 int string_hashsum(const char *s, size_t len, const char *md_algorithm, char **ret);
+static inline int string_hashsum_sha224(const char *s, size_t len, char **ret) {
+        return string_hashsum(s, len, "SHA224", ret);
+}
+static inline int string_hashsum_sha256(const char *s, size_t len, char **ret) {
+        return string_hashsum(s, len, "SHA256", ret);
+}
 
 #else
 
@@ -190,10 +196,6 @@ static inline void* EVP_PKEY_free(EVP_PKEY *p) {
         return NULL;
 }
 
-static inline int string_hashsum(const char *s, size_t len, const char *md_algorithm, char **ret) {
-        return -EOPNOTSUPP;
-}
-
 #endif
 
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(X509*, X509_free, NULL);
@@ -223,11 +225,3 @@ int openssl_load_private_key(
                 const AskPasswordRequest *request,
                 EVP_PKEY **ret_private_key,
                 OpenSSLAskPasswordUI **ret_user_interface);
-
-static inline int string_hashsum_sha224(const char *s, size_t len, char **ret) {
-        return string_hashsum(s, len, "SHA224", ret);
-}
-
-static inline int string_hashsum_sha256(const char *s, size_t len, char **ret) {
-        return string_hashsum(s, len, "SHA256", ret);
-}