Replace DNSSEC_INVALID_KEY_ALGORITHM with KNOT_INVALID_KEY_ALGORITHM

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 12adcd6e01e35d11071647096eac85b3239bca99..53ee9d9e42c82521af338348f1c0385f6c4d871d 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -32,7 +32,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 
        { KNOT_INVALID_PUBLIC_KEY,      "invalid public key" },
        { DNSSEC_INVALID_PRIVATE_KEY,   "invalid private key" },
-       { DNSSEC_INVALID_KEY_ALGORITHM, "invalid key algorithm" },
+       { KNOT_INVALID_KEY_ALGORITHM,   "invalid key algorithm" },
        { DNSSEC_INVALID_KEY_SIZE,      "invalid key size" },
        { DNSSEC_INVALID_KEY_ID,        "invalid key ID" },
        { DNSSEC_INVALID_KEY_NAME,      "invalid key name" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index f8d91b5bce4c06ee5fdde599bb821f623c4651b4..2f8c939943f37bbc625e10fcbf0f9b437a98b467 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -44,7 +44,7 @@ enum dnssec_error {
 
        KNOT_INVALID_PUBLIC_KEY,
        DNSSEC_INVALID_PRIVATE_KEY,
-       DNSSEC_INVALID_KEY_ALGORITHM,
+       KNOT_INVALID_KEY_ALGORITHM,
        DNSSEC_INVALID_KEY_SIZE,
        DNSSEC_INVALID_KEY_ID,
        DNSSEC_INVALID_KEY_NAME,

diff --git a/src/libknot/dnssec/key/algorithm.c b/src/libknot/dnssec/key/algorithm.c
index 9cc08e9890a2e4e9f35a7b841e9671fa1b4be3dd..871b5df960f160685d8cc40a21e8c6b2ec78c06f 100644 (file)
--- a/src/libknot/dnssec/key/algorithm.c
+++ b/src/libknot/dnssec/key/algorithm.c
@@ -122,7 +122,7 @@ int dnssec_algorithm_key_size_range(dnssec_key_algorithm_t algorithm,
 
        const struct limits *limits = get_limits(algorithm);
        if (!limits) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        if (min_ptr) {

diff --git a/src/libknot/dnssec/key/convert.c b/src/libknot/dnssec/key/convert.c
index 0bb8b6560e59c2fa4e2fda91ae449b6aeed998dc..b5352b10b32025361a06032e74c80567e78f06c6 100644 (file)
--- a/src/libknot/dnssec/key/convert.c
+++ b/src/libknot/dnssec/key/convert.c
@@ -321,7 +321,7 @@ int convert_pubkey_to_dnskey(gnutls_pubkey_t key, dnssec_binary_t *rdata)
 #ifdef HAVE_ED448
        case GNUTLS_PK_EDDSA_ED448: return eddsa_pubkey_to_rdata(key, rdata);
 #endif
-       default: return DNSSEC_INVALID_KEY_ALGORITHM;
+       default: return KNOT_INVALID_KEY_ALGORITHM;
        }
 }
 
@@ -343,6 +343,6 @@ int convert_dnskey_to_pubkey(uint8_t algorithm, const dnssec_binary_t *rdata,
 #ifdef HAVE_ED448
        case GNUTLS_PK_EDDSA_ED448: return eddsa_rdata_to_pubkey(rdata, key);
 #endif
-       default: return DNSSEC_INVALID_KEY_ALGORITHM;
+       default: return KNOT_INVALID_KEY_ALGORITHM;
        }
 }

diff --git a/src/libknot/dnssec/key/key.c b/src/libknot/dnssec/key/key.c
index 81952dd00315958072e13f36ce49e4fe32bce5b8..c94fedceb9884f136720633c56a40113bafbfa00 100644 (file)
--- a/src/libknot/dnssec/key/key.c
+++ b/src/libknot/dnssec/key/key.c
@@ -298,7 +298,7 @@ int dnssec_key_set_algorithm(dnssec_key_t *key, uint8_t algorithm)
        }
 
        if (!can_change_algorithm(key, algorithm)) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        wire_ctx_t wire = binary_init(&key->rdata);
@@ -334,7 +334,7 @@ int dnssec_key_set_pubkey(dnssec_key_t *key, const dnssec_binary_t *pubkey)
        }
 
        if (dnssec_key_get_algorithm(key) == 0) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        int result = dnskey_rdata_set_pubkey(&key->rdata, pubkey);

diff --git a/src/libknot/dnssec/key/privkey.c b/src/libknot/dnssec/key/privkey.c
index 25a1c68d5b3c758facf77d710a240f5563492808..55f9d44448e28747cf2237668223208aadb1ca40 100644 (file)
--- a/src/libknot/dnssec/key/privkey.c
+++ b/src/libknot/dnssec/key/privkey.c
@@ -113,7 +113,7 @@ int key_set_private_key(dnssec_key_t *key, gnutls_privkey_t privkey)
        assert(key->private_key == NULL);
 
        if (!valid_algorithm(key, privkey)) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        if (!key->public_key) {

diff --git a/src/libknot/dnssec/key/simple.c b/src/libknot/dnssec/key/simple.c
index f8efaa4a6a96dfc54117eb782f430d26366e445b..0258c0047684a31a919ff0064b723f130a021ad1 100644 (file)
--- a/src/libknot/dnssec/key/simple.c
+++ b/src/libknot/dnssec/key/simple.c
@@ -25,7 +25,7 @@ int dnssec_key_load_pkcs8(dnssec_key_t *key, const dnssec_binary_t *pem)
        }
 
        if (dnssec_key_get_algorithm(key) == 0) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        gnutls_privkey_t privkey = NULL;

diff --git a/src/libknot/dnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c
index 0b0b865240cfcefb213afe9d8aad9571e4a99c40..2eaeb84f7fdecfff9763fbcfda2a8c96e273a3d2 100644 (file)
--- a/src/libknot/dnssec/keystore/keystore.c
+++ b/src/libknot/dnssec/keystore/keystore.c
@@ -102,7 +102,7 @@ int dnssec_keystore_generate(dnssec_keystore_t *store,
 
        gnutls_pk_algorithm_t algorithm = algorithm_to_gnutls(_algorithm);
        if (algorithm == GNUTLS_PK_UNKNOWN) {
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        if (!dnssec_algorithm_key_size_check(_algorithm, bits)) {

diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
index 18470087712f792749faad09a1bfce5b32603428..0cf74fd84e68e310a570b4e8a53f5e22724ca806 100644 (file)
--- a/src/libknot/dnssec/sign/sign.c
+++ b/src/libknot/dnssec/sign/sign.c
@@ -239,7 +239,7 @@ int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key)
        ctx->functions = get_functions(key);
        if (ctx->functions == NULL) {
                free(ctx);
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        const uint8_t algo_raw = dnssec_key_get_algorithm(key);

diff --git a/src/libknot/dnssec/tsig.c b/src/libknot/dnssec/tsig.c
index 115a1251d528360bfffebe28cc3d9d28e908d97c..49a1aed303c61e52a29f27e3348b2e41f74d35f4 100644 (file)
--- a/src/libknot/dnssec/tsig.c
+++ b/src/libknot/dnssec/tsig.c
@@ -161,7 +161,7 @@ int dnssec_tsig_new(dnssec_tsig_ctx_t **ctx_ptr,
        ctx->algorithm = algorithm_to_gnutls(algorithm);
        if (ctx->algorithm == GNUTLS_MAC_UNKNOWN) {
                free(ctx);
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 
        int result = gnutls_hmac_init(&ctx->hash, ctx->algorithm, key->data, key->size);

diff --git a/src/utils/keymgr/bind_privkey.c b/src/utils/keymgr/bind_privkey.c
index 8c86cde06883fa35f2be90e071e4adee7eb782c4..59d8cc589d8c3baff7c458a4edcd05bf6f4a7fbf 100644 (file)
--- a/src/utils/keymgr/bind_privkey.c
+++ b/src/utils/keymgr/bind_privkey.c
@@ -80,7 +80,7 @@ static int parse_algorithm(char *string, void *_algorithm)
        uint8_t *algorithm = _algorithm;
        int r = str_to_u8(string, algorithm);
 
-       return (r == KNOT_EOK ? KNOT_EOK : DNSSEC_INVALID_KEY_ALGORITHM);
+       return (r == KNOT_EOK ? KNOT_EOK : KNOT_INVALID_KEY_ALGORITHM);
 }
 
 /*!
@@ -376,7 +376,7 @@ int bind_privkey_to_pem(dnssec_key_t *key, bind_privkey_t *params, dnssec_binary
 #endif
                return eddsa_params_to_pem(key, params, pem);
        default:
-               return DNSSEC_INVALID_KEY_ALGORITHM;
+               return KNOT_INVALID_KEY_ALGORITHM;
        }
 }
 

diff --git a/tests/libknot/test_dnssec_key.c b/tests/libknot/test_dnssec_key.c
index fb9a3336e2c43d6120e8b086c3a1aac8270cda23..acb77c361f089aef4aaf28a763d548e089197a1d 100644 (file)
--- a/tests/libknot/test_dnssec_key.c
+++ b/tests/libknot/test_dnssec_key.c
@@ -50,7 +50,7 @@ static void test_public_key(const key_parameters_t *params)
        // create from parameters
 
        r = dnssec_key_set_pubkey(key, &params->public_key);
-       ok(r == DNSSEC_INVALID_KEY_ALGORITHM,
+       ok(r == KNOT_INVALID_KEY_ALGORITHM,
           "set public key (fails, no algorithm set)");
 
        check_attr_scalar(key, uint16_t, flags,     256, params->flags);