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/resolve/resolved-dns-packet.c | |
| 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/resolve/resolved-dns-packet.c')
| -rw-r--r-- | src/resolve/resolved-dns-packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index a70ec17743..d45f87ff5d 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_GCRYPT -#include <gcrypt.h> +# include <gcrypt.h> #endif #include "alloc-util.h" @@ -776,7 +776,7 @@ int dns_packet_append_opt( static const uint8_t rfc6975[] = { 0, 5, /* OPTION_CODE: DAU */ -#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600 +#if PREFER_OPENSSL || (HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600) 0, 7, /* LIST_LENGTH */ #else 0, 6, /* LIST_LENGTH */ @@ -787,7 +787,7 @@ int dns_packet_append_opt( DNSSEC_ALGORITHM_RSASHA512, DNSSEC_ALGORITHM_ECDSAP256SHA256, DNSSEC_ALGORITHM_ECDSAP384SHA384, -#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600 +#if PREFER_OPENSSL || (HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600) DNSSEC_ALGORITHM_ED25519, #endif |