Replace DNSSEC_NO_PRIVATE_KEY with KNOT_NO_PRIVATE_KEY

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 455930e96d70da77b900fce016e2cf4cd3b6c8ab..9c21ddf6f4a7ee6350959dbf97321af6571605e0 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -38,7 +38,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { KNOT_INVALID_KEY_NAME,        "invalid key name" },
 
        { KNOT_NO_PUBLIC_KEY,           "no public key" },
-       { DNSSEC_NO_PRIVATE_KEY,        "no private key" },
+       { KNOT_NO_PRIVATE_KEY,  "no private key" },
        { DNSSEC_KEY_ALREADY_PRESENT,   "key already present" },
 
        { DNSSEC_SIGN_INIT_ERROR,       "signing initialization error" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index 41e8f72926de8521e5de9832cb6bea8183b6f0ed..f71d794c4e3729e32a510ee890aafd2c1c0efb1e 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -50,7 +50,7 @@ enum dnssec_error {
        KNOT_INVALID_KEY_NAME,
 
        KNOT_NO_PUBLIC_KEY,
-       DNSSEC_NO_PRIVATE_KEY,
+       KNOT_NO_PRIVATE_KEY,
        DNSSEC_KEY_ALREADY_PRESENT,
 
        DNSSEC_SIGN_INIT_ERROR,

diff --git a/src/libknot/dnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c
index e73bb69287a66cdfce17ef495a1c324c15db6d1f..55e583f6a47588eebec8d6c6a44f05ef36526d6a 100644 (file)
--- a/src/libknot/dnssec/keystore/keystore.c
+++ b/src/libknot/dnssec/keystore/keystore.c
@@ -168,7 +168,7 @@ int dnssec_keystore_set_private(dnssec_keystore_t *store, dnssec_key_t *key)
        }
 
        if (!key->private_key) {
-               return DNSSEC_NO_PRIVATE_KEY;
+               return KNOT_NO_PRIVATE_KEY;
        }
 
        return store->functions->set_private(store->ctx, key->private_key);

diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
index f53108405891622c1d9f5095008787f4a14d288b..fcd60279f1f1754f26552ba23cd2ef96d92b7b7a 100644 (file)
--- a/src/libknot/dnssec/sign/sign.c
+++ b/src/libknot/dnssec/sign/sign.c
@@ -306,7 +306,7 @@ int dnssec_sign_write(dnssec_sign_ctx_t *ctx, dnssec_sign_flags_t flags, dnssec_
        }
 
        if (!dnssec_key_can_sign(ctx->key)) {
-               return DNSSEC_NO_PRIVATE_KEY;
+               return KNOT_NO_PRIVATE_KEY;
        }
 
        gnutls_datum_t data = {

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 1da0c8520eb3c86f7c5cbe5c97ce3d4aae584972..aaae64924fe69d112a6d3923130e5311917ccffc 100644 (file)
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -207,7 +207,7 @@ int knot_error_from_libdnssec(int libdnssec_errcode)
        case KNOT_ENOENT:
                return KNOT_ENOENT;
        case KNOT_NO_PUBLIC_KEY:
-       case DNSSEC_NO_PRIVATE_KEY:
+       case KNOT_NO_PRIVATE_KEY:
                return KNOT_DNSSEC_ENOKEY;
        // EOK, EINVAL, ENOMEM and ENOENT are identical, no need to translate
        case KNOT_INVALID_PUBLIC_KEY ... KNOT_INVALID_KEY_NAME: