From d527ae11c9b3af9fa31991d4c4fcadfd84cf4930 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 9 Aug 2023 11:43:36 +1000 Subject: [PATCH] Fix clang formatting --- lib/dns/dst_parse.c | 6 ++---- lib/dns/openssl_link.c | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 4998879248..0778d90795 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -233,8 +233,7 @@ check_ecdsa(const dst_private_t *priv, bool external) { mask = (1ULL << TAG_SHIFT) - 1; - ok = have[TAG_ECDSA_LABEL & mask] || - have[TAG_ECDSA_PRIVATEKEY & mask]; + ok = have[TAG_ECDSA_LABEL & mask] || have[TAG_ECDSA_PRIVATEKEY & mask]; return (ok ? 0 : -1); } @@ -267,8 +266,7 @@ check_eddsa(const dst_private_t *priv, bool external) { mask = (1ULL << TAG_SHIFT) - 1; - ok = have[TAG_EDDSA_LABEL & mask] || - have[TAG_EDDSA_PRIVATEKEY & mask]; + ok = have[TAG_EDDSA_LABEL & mask] || have[TAG_EDDSA_PRIVATEKEY & mask]; return (ok ? 0 : -1); } diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 2aef28b930..005e7832d3 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -272,8 +272,9 @@ err: } static isc_result_t -dst__openssl_fromlabel_provider(int key_base_id, const char *label, const char *pin, - EVP_PKEY **ppub, EVP_PKEY **ppriv) { +dst__openssl_fromlabel_provider(int key_base_id, const char *label, + const char *pin, EVP_PKEY **ppub, + EVP_PKEY **ppriv) { #if OPENSSL_VERSION_NUMBER >= 0x30000000L isc_result_t ret = DST_R_OPENSSLFAILURE; OSSL_STORE_CTX *ctx = NULL; @@ -336,8 +337,8 @@ isc_result_t dst__openssl_fromlabel(int key_base_id, const char *engine, const char *label, const char *pin, EVP_PKEY **ppub, EVP_PKEY **ppriv) { if (engine == NULL) { - return (dst__openssl_fromlabel_provider(key_base_id, label, - pin, ppub, ppriv)); + return (dst__openssl_fromlabel_provider(key_base_id, label, pin, + ppub, ppriv)); } return (dst__openssl_fromlabel_engine(key_base_id, engine, label, pin,