Replace DNSSEC_NOT_IMPLEMENTED_ERROR with KNOT_ENOTSUP

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index b26899482b119fd6ae2b0787537565934334a5b7..01be512de93f0ec02afe44a0926b0cb907f60932 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -21,7 +21,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { KNOT_ENOENT,          "no such file or directory" },
 
        { DNSSEC_ERROR,                 "unspecified error" },
-       { DNSSEC_NOT_IMPLEMENTED_ERROR, "not implemented" },
+       { KNOT_ENOTSUP, "not implemented" },
        { DNSSEC_MALFORMED_DATA,        "malformed data" },
        { DNSSEC_NOT_FOUND,             "not found" },
 

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index e6c15fac02344c482d809955d43343430b7cb480..0380125136e69080671e092a798691c99f206cc7 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -33,7 +33,7 @@ enum dnssec_error {
        DNSSEC_ERROR_MIN = -1500,
 
        DNSSEC_ERROR = DNSSEC_ERROR_MIN,
-       DNSSEC_NOT_IMPLEMENTED_ERROR,
+       KNOT_ENOTSUP,
        DNSSEC_MALFORMED_DATA,
        DNSSEC_NOT_FOUND,
 

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index d42c9d47a08e30f83ff855841c5341e4f4b2c9f5..261f029bcbd2597acac440362cd38be6666ed5f3 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -380,7 +380,7 @@ int dnssec_keystore_init_pkcs11(dnssec_keystore_t **store_ptr)
 _public_
 int dnssec_keystore_init_pkcs11(dnssec_keystore_t **store_ptr)
 {
-       return DNSSEC_NOT_IMPLEMENTED_ERROR;
+       return KNOT_ENOTSUP;
 }
 
 #endif

diff --git a/src/libknot/dnssec/p11/p11.c b/src/libknot/dnssec/p11/p11.c
index 1de8c35e17ae58d97529a12c951434ed2b5ca44a..6b24d01f6204eda824fc15f38fddb5ef236ab42c 100644 (file)
--- a/src/libknot/dnssec/p11/p11.c
+++ b/src/libknot/dnssec/p11/p11.c
@@ -91,7 +91,7 @@ int p11_reinit(void)
 
 int p11_load_module(const char *module)
 {
-       return DNSSEC_NOT_IMPLEMENTED_ERROR;
+       return KNOT_ENOTSUP;
 }
 
 void p11_cleanup(void)

diff --git a/src/libknot/dnssec/sign/der.c b/src/libknot/dnssec/sign/der.c
index 5f71f9aaeb0026295f235a0b71922ee1b360ab71..9ab0c6118dcd7d655a7f16e021b4ca69fa24e08a 100644 (file)
--- a/src/libknot/dnssec/sign/der.c
+++ b/src/libknot/dnssec/sign/der.c
@@ -49,7 +49,7 @@ static int asn1_decode_size(wire_ctx_t *wire, size_t *size)
        uint8_t byte = wire_ctx_read_u8(wire);
        if (byte & 0x80) {
                // long form, we do not need it for DNSSEC
-               return DNSSEC_NOT_IMPLEMENTED_ERROR;
+               return KNOT_ENOTSUP;
        }
 
        *size = byte;
@@ -189,12 +189,12 @@ int dss_sig_value_encode(const dnssec_binary_t *r, const dnssec_binary_t *s,
        // check supported inputs range
 
        if (r_size > ASN1_MAX_SIZE || s_size > ASN1_MAX_SIZE) {
-               return DNSSEC_NOT_IMPLEMENTED_ERROR;
+               return KNOT_ENOTSUP;
        }
 
        size_t seq_size = 2 + r_size + 2 + s_size;
        if (seq_size > ASN1_MAX_SIZE) {
-               return DNSSEC_NOT_IMPLEMENTED_ERROR;
+               return KNOT_ENOTSUP;
        }
 
        // encode result

diff --git a/tests/libknot/test_dnssec_keystore_pkcs11.c b/tests/libknot/test_dnssec_keystore_pkcs11.c
index d132742403a0598728cc9c47d9d04a86116662f1..aecc338d89e0a2e5111dc3932099f925a7a254c5 100644 (file)
--- a/tests/libknot/test_dnssec_keystore_pkcs11.c
+++ b/tests/libknot/test_dnssec_keystore_pkcs11.c
@@ -350,7 +350,7 @@ int main(int argc, char *argv[])
 
        dnssec_keystore_t *store = NULL;
        int r = dnssec_keystore_init_pkcs11(&store);
-       if (r == DNSSEC_NOT_IMPLEMENTED_ERROR) {
+       if (r == KNOT_ENOTSUP) {
                skip_all("not supported");
                goto done;
        }