From 4f55f11b54bb276a88a3787c7fc3e0d654423daf Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Wed, 22 Oct 2025 08:05:19 +0200
Subject: [PATCH] Replace DNSSEC_KEYSTORE_INVALID_CONFIG with KNOT_P11_ECONFIG

---
 src/libknot/dnssec/error.c           | 2 +-
 src/libknot/dnssec/error.h           | 2 +-
 src/libknot/dnssec/keystore/pkcs11.c | 2 +-
 src/libknot/errcode.h                | 1 +
 src/libknot/error.c                  | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index c678584bd4..948a337b6e 100644
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -51,7 +51,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 	{ DNSSEC_INVALID_DS_ALGORITHM,	"invalid DS algorithm" },
 	{ KNOT_ECRYPTO,	"DS hashing error" },
 
-	{ DNSSEC_KEYSTORE_INVALID_CONFIG,  "invalid KASP keystore configuration" },
+	{ KNOT_EINVAL,  "invalid KASP keystore configuration" },
 
 	{ DNSSEC_P11_FAILED_TO_LOAD_MODULE, "failed to load PKCS #11 module" },
 	{ DNSSEC_P11_TOO_MANY_MODULES,      "too many PKCS #11 modules loaded" },
diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index 768935eee7..5926a3d4d9 100644
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -63,7 +63,7 @@ enum dnssec_error {
 	KNOT_EALGORITHM,
 	KNOT_ECRYPTO,
 
-	DNSSEC_KEYSTORE_INVALID_CONFIG,
+	KNOT_EINVAL,
 
 	DNSSEC_P11_FAILED_TO_LOAD_MODULE,
 	DNSSEC_P11_TOO_MANY_MODULES,
diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index 4d22b697c1..b840e112d6 100644
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -78,7 +78,7 @@ static int parse_config(const char *config, char **uri_ptr, char **module_ptr)
 {
 	const char *space = strchr(config, ' ');
 	if (!space) {
-		return DNSSEC_KEYSTORE_INVALID_CONFIG;
+		return KNOT_P11_ECONFIG;
 	}
 
 	char *url = strndup(config, space - config);
diff --git a/src/libknot/errcode.h b/src/libknot/errcode.h
index 546f906a3b..0f611fbef6 100644
--- a/src/libknot/errcode.h
+++ b/src/libknot/errcode.h
@@ -181,6 +181,7 @@ enum knot_error {
 	KNOT_KEY_EGENERATE,
 	KNOT_EALGORITHM,
 	KNOT_ECRYPTO,
+	KNOT_P11_ECONFIG,
 
 	KNOT_ERROR_MAX = -501
 };
diff --git a/src/libknot/error.c b/src/libknot/error.c
index ec71814960..3450d58baf 100644
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -180,6 +180,7 @@ static const struct error errors[] = {
 	{ KNOT_KEY_EGENERATE,          "failed to generate key" },
 	{ KNOT_EALGORITHM,             "invalid hash algorithm" },
 	{ KNOT_ECRYPTO,                "crypto operation failed" },
+	{ KNOT_P11_ECONFIG,            "invalid PKCS #11 configuration" },
 
 	/* Terminator */
 	{ KNOT_ERROR, NULL }
-- 
2.47.3