upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-10 02:01:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix clang formatting

Browse source
This commit is contained in:
Mark Andrews 2023-08-09 11:43:36 +10:00
parent 3907de98ca
commit d527ae11c9
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dns/dst_parse.c
View file

@ -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);
}

9
lib/dns/openssl_link.c
View file

@ -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,