Replace DNSSEC_INVALID_KEY_ID with KNOT_INVALID_KEY_ID

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 37045370167529c943d0c92a9adc5304035ce773..d68d198fd21232fefb38b604ddf6a1ef3dedee33 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -34,7 +34,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { DNSSEC_INVALID_PRIVATE_KEY,   "invalid private key" },
        { KNOT_INVALID_KEY_ALGORITHM,   "invalid key algorithm" },
        { KNOT_INVALID_KEY_SIZE,        "invalid key size" },
-       { DNSSEC_INVALID_KEY_ID,        "invalid key ID" },
+       { KNOT_INVALID_KEY_ID,  "invalid key ID" },
        { DNSSEC_INVALID_KEY_NAME,      "invalid key name" },
 
        { DNSSEC_NO_PUBLIC_KEY,         "no public key" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index dcf26691d098712e987ff47fe1e6e7bdd7c1d460..b7498207b58558c40e740e57f85afcdca27d4a12 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -46,7 +46,7 @@ enum dnssec_error {
        DNSSEC_INVALID_PRIVATE_KEY,
        KNOT_INVALID_KEY_ALGORITHM,
        KNOT_INVALID_KEY_SIZE,
-       DNSSEC_INVALID_KEY_ID,
+       KNOT_INVALID_KEY_ID,
        DNSSEC_INVALID_KEY_NAME,
 
        DNSSEC_NO_PUBLIC_KEY,

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index d209e81a85c455cbc913a4988aa02fb910459ae6..83cec636c17a71454d4d3c237fce006f304821b8 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -37,7 +37,7 @@ static int key_url(const char *token_uri, const char *key_id, char **url_ptr)
        assert(url_ptr);
 
        if (!dnssec_keyid_is_valid(key_id)) {
-               return DNSSEC_INVALID_KEY_ID;
+               return KNOT_INVALID_KEY_ID;
        }
 
        size_t token_len = strlen(token_uri);

diff --git a/src/libknot/dnssec/shared/keyid_gnutls.c b/src/libknot/dnssec/shared/keyid_gnutls.c
index a7437f97e4c8324c438ab1ee7bca9a07e31d51ad..a4dc0bb91190543a09a87506dd1e4ff7148167f6 100644 (file)
--- a/src/libknot/dnssec/shared/keyid_gnutls.c
+++ b/src/libknot/dnssec/shared/keyid_gnutls.c
@@ -34,7 +34,7 @@ static int keyid_bin(gnutls_x509_privkey_t key, gnutls_pubkey_t pubkey, dnssec_b
                    : gnutls_pubkey_get_key_id(pubkey, flags, buffer, &size);
 
        if (r != GNUTLS_E_SUCCESS || size != DNSSEC_KEYID_BINARY_SIZE) {
-               return DNSSEC_INVALID_KEY_ID;
+               return KNOT_INVALID_KEY_ID;
        }
 
        assert(size == DNSSEC_KEYID_BINARY_SIZE);

diff --git a/src/utils/keymgr/functions.c b/src/utils/keymgr/functions.c
index 479aba4187b6c0b3d607a2a3f0b437e922d9d937..c5287ba040ff024ed3a175af155815b59a4f0ddb 100644 (file)
--- a/src/utils/keymgr/functions.c
+++ b/src/utils/keymgr/functions.c
@@ -649,7 +649,7 @@ int keymgr_import_pem(kdnssec_ctx_t *ctx, const char *import_file, int argc, cha
 int keymgr_import_pkcs11(kdnssec_ctx_t *ctx, char *key_id, int argc, char *argv[])
 {
        if (!dnssec_keyid_is_valid(key_id)) {
-               return DNSSEC_INVALID_KEY_ID;
+               return KNOT_INVALID_KEY_ID;
        }
 
        knot_kasp_keystore_t *keystore = knot_store_for_key(ctx->keystores, genkeyargs_ksk(argc, argv));