From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 21 Oct 2025 08:19:57 +0000 (+0200)
Subject: Replace DNSSEC_INVALID_KEY_NAME with KNOT_INVALID_KEY_NAME
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2d690afb88a75040dd3b52b017e1c3dfb1582d7;p=thirdparty%2Fknot-dns.git

Replace DNSSEC_INVALID_KEY_NAME with KNOT_INVALID_KEY_NAME
---

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index d68d198fd2..688c9155c9 100644
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -35,7 +35,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 	{ KNOT_INVALID_KEY_ALGORITHM,	"invalid key algorithm" },
 	{ KNOT_INVALID_KEY_SIZE,	"invalid key size" },
 	{ KNOT_INVALID_KEY_ID,	"invalid key ID" },
-	{ DNSSEC_INVALID_KEY_NAME,	"invalid key name" },
+	{ KNOT_INVALID_KEY_NAME,	"invalid key name" },
 
 	{ DNSSEC_NO_PUBLIC_KEY,		"no public key" },
 	{ DNSSEC_NO_PRIVATE_KEY,	"no private key" },
diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index b7498207b5..9bb890f59f 100644
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -47,7 +47,7 @@ enum dnssec_error {
 	KNOT_INVALID_KEY_ALGORITHM,
 	KNOT_INVALID_KEY_SIZE,
 	KNOT_INVALID_KEY_ID,
-	DNSSEC_INVALID_KEY_NAME,
+	KNOT_INVALID_KEY_NAME,
 
 	DNSSEC_NO_PUBLIC_KEY,
 	DNSSEC_NO_PRIVATE_KEY,
diff --git a/src/libknot/dnssec/key/ds.c b/src/libknot/dnssec/key/ds.c
index e921d0e554..3a13511363 100644
--- a/src/libknot/dnssec/key/ds.c
+++ b/src/libknot/dnssec/key/ds.c
@@ -65,7 +65,7 @@ int dnssec_key_create_ds(const dnssec_key_t *key,
 	}
 
 	if (!key->dname) {
-		return DNSSEC_INVALID_KEY_NAME;
+		return KNOT_INVALID_KEY_NAME;
 	}
 
 	if (!key->public_key){
diff --git a/src/libknot/error.c b/src/libknot/error.c
index 92d0bfbe42..98d718f56f 100644
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -210,7 +210,7 @@ int knot_error_from_libdnssec(int libdnssec_errcode)
 	case DNSSEC_NO_PRIVATE_KEY:
 		return KNOT_DNSSEC_ENOKEY;
 	// EOK, EINVAL, ENOMEM and ENOENT are identical, no need to translate
-	case KNOT_INVALID_PUBLIC_KEY ... DNSSEC_INVALID_KEY_NAME:
+	case KNOT_INVALID_PUBLIC_KEY ... KNOT_INVALID_KEY_NAME:
 		return libdnssec_errcode
 		       - KNOT_INVALID_PUBLIC_KEY + KNOT_INVALID_PUBLIC_KEY;
 	default:
diff --git a/tests/libknot/test_dnssec_key_ds.c b/tests/libknot/test_dnssec_key_ds.c
index 235057bb11..2a9ca4842c 100644
--- a/tests/libknot/test_dnssec_key_ds.c
+++ b/tests/libknot/test_dnssec_key_ds.c
@@ -62,7 +62,7 @@ static void test_errors(const struct key_parameters *params)
 
 	dnssec_key_new(&key);
 	r = dnssec_key_create_ds(key, DNSSEC_KEY_DIGEST_SHA1, &ds);
-	is_int(DNSSEC_INVALID_KEY_NAME, r, "dnssec_key_create_ds() no key name");
+	is_int(KNOT_INVALID_KEY_NAME, r, "dnssec_key_create_ds() no key name");
 
 	dnssec_key_set_dname(key, params->name);
 	r = dnssec_key_create_ds(key, DNSSEC_KEY_DIGEST_SHA1, &ds);