Replace DNSSEC_ERROR with KNOT_ERROR

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index e10fd29729cc6cdf4bb1c3947befc4808a7c3de4..b0408c43c18f894aab8309b611321bca040c3e08 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -20,7 +20,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { KNOT_EINVAL,          "invalid argument" },
        { KNOT_ENOENT,          "no such file or directory" },
 
-       { DNSSEC_ERROR,                 "unspecified error" },
+       { KNOT_ERROR,                   "unspecified error" },
        { KNOT_ENOTSUP, "not implemented" },
        { KNOT_EMALF,   "malformed data" },
        { KNOT_ENOENT,          "not found" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index 2076d677f1393218cad369bef55f58786cb25451..b02a0a3d5088ad29afc27d73283c57fd32408ce0 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -32,7 +32,7 @@ enum dnssec_error {
 
        DNSSEC_ERROR_MIN = -1500,
 
-       DNSSEC_ERROR = DNSSEC_ERROR_MIN,
+       KNOT_ERROR = DNSSEC_ERROR_MIN,
        KNOT_ENOTSUP,
        KNOT_EMALF,
        KNOT_ENOENT,

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index 83cec636c17a71454d4d3c237fce006f304821b8..4d22b697c1708d647db59b3927df19a138cc1c85 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -306,7 +306,7 @@ static int pkcs11_remove_key(void *_ctx, const char *id)
 
        r = gnutls_pkcs11_delete_url(url, GNUTLS_PKCS11_OBJ_FLAG_LOGIN);
        if (r < 0) {
-               return DNSSEC_ERROR;
+               return KNOT_ERROR;
        } else if (r == 0) {
                return KNOT_ENOENT;
        }

diff --git a/src/libknot/dnssec/p11/p11.c b/src/libknot/dnssec/p11/p11.c
index 6b24d01f6204eda824fc15f38fddb5ef236ab42c..cf2d5093c54125f3e4daa4f5b3a142bbec7f1fde 100644 (file)
--- a/src/libknot/dnssec/p11/p11.c
+++ b/src/libknot/dnssec/p11/p11.c
@@ -20,7 +20,7 @@ static int pkcs11_modules_count = 0;
 
 static int map_result(int gnutls_result)
 {
-       return gnutls_result == GNUTLS_E_SUCCESS ? KNOT_EOK : DNSSEC_ERROR;
+       return gnutls_result == GNUTLS_E_SUCCESS ? KNOT_EOK : KNOT_ERROR;
 }
 
 int p11_init(void)

diff --git a/src/libknot/dnssec/random.c b/src/libknot/dnssec/random.c
index e25acd574383d501f2f173de1b33b053b53ece8b..6bab18aba95cfd55e29b7fc9e6c67755818655da 100644 (file)
--- a/src/libknot/dnssec/random.c
+++ b/src/libknot/dnssec/random.c
@@ -25,7 +25,7 @@ int dnssec_random_buffer(uint8_t *data, size_t size)
        int result = gnutls_rnd(GNUTLS_RND_RANDOM, data, size);
        if (result != 0) {
                assert_unreachable();
-               return DNSSEC_ERROR;
+               return KNOT_ERROR;
        }
 
        return KNOT_EOK;

diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
index fcd60279f1f1754f26552ba23cd2ef96d92b7b7a..ed0a36ccecb1548a65785f669f0a4d1b1075ed26 100644 (file)
--- a/src/libknot/dnssec/sign/sign.c
+++ b/src/libknot/dnssec/sign/sign.c
@@ -376,7 +376,7 @@ int dnssec_sign_verify(dnssec_sign_ctx_t *ctx, bool sign_cmp, const dnssec_binar
        if (result == GNUTLS_E_PK_SIG_VERIFY_FAILED) {
                return DNSSEC_INVALID_SIGNATURE;
        } else if (result < 0) {
-               return DNSSEC_ERROR;
+               return KNOT_ERROR;
        }
 
        return KNOT_EOK;

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 5dbc3da0f18c3fe9d97dcd9416d9db65c2592f22..5d1285f773d4e0a164b9f1ecec22d2a58ba26ada 100644 (file)
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -201,7 +201,7 @@ _public_
 int knot_error_from_libdnssec(int libdnssec_errcode)
 {
        switch (libdnssec_errcode) {
-       case DNSSEC_ERROR:
+       case KNOT_ERROR:
                return KNOT_ERROR;
        case KNOT_EMALF:
                return KNOT_EMALF;