Replace DNSSEC_DIGEST/DS_HASHING/NSEC3_HASHING_ERROR with KNOT_ECRYPTO

diff --git a/src/libknot/dnssec/digest.c b/src/libknot/dnssec/digest.c
index a8034fe326f1de8b5d4e08503a31183d22e70f7b..ef14532cd990078c26dca6909800f51954dd189a 100644 (file)
--- a/src/libknot/dnssec/digest.c
+++ b/src/libknot/dnssec/digest.c
@@ -45,7 +45,7 @@ int dnssec_digest_init(dnssec_digest_t algorithm, dnssec_digest_ctx_t **out_ctx)
        res->size = gnutls_hash_get_len(gtalg);
        if (res->size == 0 || gnutls_hash_init(&res->gtctx, gtalg) < 0) {
                free(res);
-               return DNSSEC_DIGEST_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        *out_ctx = res;
@@ -68,7 +68,7 @@ int dnssec_digest(dnssec_digest_ctx_t *ctx, dnssec_binary_t *data)
        int r = gnutls_hash(ctx->gtctx, data->data, data->size);
        if (r != 0) {
                digest_ctx_free(ctx);
-               return DNSSEC_DIGEST_ERROR;
+               return KNOT_ECRYPTO;
        }
        return KNOT_EOK;
 }

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index b0408c43c18f894aab8309b611321bca040c3e08..3d2a7b57c9411ab09cfd5d06903861b4dff3aefe 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -46,10 +46,10 @@ static const error_message_t ERROR_MESSAGES[] = {
        { DNSSEC_INVALID_SIGNATURE,     "invalid signature" },
 
        { DNSSEC_INVALID_NSEC3_ALGORITHM, "invalid NSEC3 algorithm" },
-       { DNSSEC_NSEC3_HASHING_ERROR,   "NSEC3 hashing error" },
+       { KNOT_ECRYPTO, "NSEC3 hashing error" },
 
        { DNSSEC_INVALID_DS_ALGORITHM,  "invalid DS algorithm" },
-       { DNSSEC_DS_HASHING_ERROR,      "DS hashing error" },
+       { KNOT_ECRYPTO, "DS hashing error" },
 
        { DNSSEC_KEYSTORE_INVALID_CONFIG,  "invalid KASP keystore configuration" },
 
@@ -58,7 +58,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { DNSSEC_P11_TOKEN_NOT_AVAILABLE,   "PKCS #11 token not available" },
 
        { DNSSEC_INVALID_DIGEST_ALGORITHM,  "invalid digest algorithm" },
-       { DNSSEC_DIGEST_ERROR,              "digest error" },
+       { KNOT_ECRYPTO,              "digest error" },
 
        { 0 }
 };

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index b02a0a3d5088ad29afc27d73283c57fd32408ce0..2540f4e1c35f20fa1a8b363cfd0e0590d6a8a8c9 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -58,10 +58,10 @@ enum dnssec_error {
        DNSSEC_INVALID_SIGNATURE,
 
        KNOT_EALGORITHM,
-       DNSSEC_NSEC3_HASHING_ERROR,
+       KNOT_ECRYPTO,
 
        KNOT_EALGORITHM,
-       DNSSEC_DS_HASHING_ERROR,
+       KNOT_ECRYPTO,
 
        DNSSEC_KEYSTORE_INVALID_CONFIG,
 
@@ -70,7 +70,7 @@ enum dnssec_error {
        DNSSEC_P11_TOKEN_NOT_AVAILABLE,
 
        KNOT_EALGORITHM,
-       DNSSEC_DIGEST_ERROR,
+       KNOT_ECRYPTO,
 
        DNSSEC_ERROR_MAX = -1001
 };

diff --git a/src/libknot/dnssec/key/ds.c b/src/libknot/dnssec/key/ds.c
index 054aa41bf37e1215805280bf6d65fad5b31c24db..52755d6b0910aaf871ad0d3550007792ad999c29 100644 (file)
--- a/src/libknot/dnssec/key/ds.c
+++ b/src/libknot/dnssec/key/ds.c
@@ -82,20 +82,20 @@ int dnssec_key_create_ds(const dnssec_key_t *key,
        _cleanup_hash_ gnutls_hash_hd_t digest = NULL;
        int r = gnutls_hash_init(&digest, algorithm);
        if (r < 0) {
-               return DNSSEC_DS_HASHING_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        if (gnutls_hash(digest, key->dname, knot_dname_size(key->dname)) != 0 ||
            gnutls_hash(digest, key->rdata.data, key->rdata.size) != 0
        ) {
-               return DNSSEC_DS_HASHING_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        // build DS RDATA
 
        int digest_size = gnutls_hash_get_len(algorithm);
        if (digest_size == 0) {
-               return DNSSEC_DS_HASHING_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        dnssec_binary_t rdata = { 0 };

diff --git a/src/libknot/dnssec/nsec/hash.c b/src/libknot/dnssec/nsec/hash.c
index e40253a4be631deeaa4b4f4a2de66a39ae1dfaab..29d685fd19beb09566206102d768bfaac1ba45cc 100644 (file)
--- a/src/libknot/dnssec/nsec/hash.c
+++ b/src/libknot/dnssec/nsec/hash.c
@@ -29,7 +29,7 @@ static int nsec3_hash(gnutls_digest_algorithm_t algorithm, int iterations,
 
        int hash_size = gnutls_hash_get_len(algorithm);
        if (hash_size <= 0) {
-               return DNSSEC_NSEC3_HASHING_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        int result = dnssec_binary_resize(hash, hash_size);
@@ -40,7 +40,7 @@ static int nsec3_hash(gnutls_digest_algorithm_t algorithm, int iterations,
        _cleanup_hash_ gnutls_hash_hd_t digest = NULL;
        result = gnutls_hash_init(&digest, algorithm);
        if (result < 0) {
-               return DNSSEC_NSEC3_HASHING_ERROR;
+               return KNOT_ECRYPTO;
        }
 
        const uint8_t *in = data->data;
@@ -49,12 +49,12 @@ static int nsec3_hash(gnutls_digest_algorithm_t algorithm, int iterations,
        for (int i = 0; i <= iterations; i++) {
                result = gnutls_hash(digest, in, in_size);
                if (result < 0) {
-                       return DNSSEC_NSEC3_HASHING_ERROR;
+                       return KNOT_ECRYPTO;
                }
 
                result = gnutls_hash(digest, salt->data, salt->size);
                if (result < 0) {
-                       return DNSSEC_NSEC3_HASHING_ERROR;
+                       return KNOT_ECRYPTO;
                }
 
                gnutls_hash_output(digest, hash->data);