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 d68d198fd21232fefb38b604ddf6a1ef3dedee33..688c9155c996043c3c35a5bff9047530bbc2d253 100644 (file)
--- 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 b7498207b58558c40e740e57f85afcdca27d4a12..9bb890f59fc7e43ecab0d6d2d022bb72b0368496 100644 (file)
--- 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 e921d0e554e2695f9745541134e27aefde0f48fe..3a1351136345a05ac87f13e07c71f2e2105b37fa 100644 (file)
--- 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 92d0bfbe4246b3852ac461cdab581ebfee0b4b97..98d718f56fc598380cc609e32c263746fb3dfa71 100644 (file)
--- 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 235057bb11663d3162b3376f15af212f5a6acc15..2a9ca4842cd15f2379d640324958567153945e50 100644 (file)
--- 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);