diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-10-27 15:39:48 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-12-01 12:36:57 +0100 |
| commit | 7e8facb36b218720bfd9326c4b668acc5da56cd6 (patch) | |
| tree | 8e3cd1d7d0337e61fcff46357a41dddb57be6fdb /src/basic/gcrypt-util.h | |
| parent | fc169a6fb2e56d66fc2937e348e9858352ef4b39 (diff) | |
| download | systemd-7e8facb36b218720bfd9326c4b668acc5da56cd6.tar.gz | |
port string_hashsum from libgcrypt to openssl^gcrypt
This allows resolved and importd to be built without libgcrypt.
Note that we now say either 'cryptographic library' or 'cryptolib'.
Co-authored-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Diffstat (limited to 'src/basic/gcrypt-util.h')
| -rw-r--r-- | src/basic/gcrypt-util.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/basic/gcrypt-util.h b/src/basic/gcrypt-util.h index 27dcc72028..4c40cefbed 100644 --- a/src/basic/gcrypt-util.h +++ b/src/basic/gcrypt-util.h @@ -12,23 +12,28 @@ #include "macro.h" void initialize_libgcrypt(bool secmem); -int string_hashsum(const char *s, size_t len, int md_algorithm, char **out); DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(gcry_md_hd_t, gcry_md_close, NULL); #endif +#if !PREFER_OPENSSL +# if HAVE_GCRYPT +int string_hashsum(const char *s, size_t len, int md_algorithm, char **out); +# endif + static inline int string_hashsum_sha224(const char *s, size_t len, char **out) { -#if HAVE_GCRYPT +# if HAVE_GCRYPT return string_hashsum(s, len, GCRY_MD_SHA224, out); -#else +# else return -EOPNOTSUPP; -#endif +# endif } static inline int string_hashsum_sha256(const char *s, size_t len, char **out) { -#if HAVE_GCRYPT +# if HAVE_GCRYPT return string_hashsum(s, len, GCRY_MD_SHA256, out); -#else +# else return -EOPNOTSUPP; -#endif +# endif } +#endif |