Replace DNSSEC_MALFORMED_DATA with KNOT_EMALF

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 01be512de93f0ec02afe44a0926b0cb907f60932..44ae7018b7334607b65de4b8c17785989bf56e05 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -22,7 +22,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 
        { DNSSEC_ERROR,                 "unspecified error" },
        { KNOT_ENOTSUP, "not implemented" },
-       { DNSSEC_MALFORMED_DATA,        "malformed data" },
+       { KNOT_EMALF,   "malformed data" },
        { DNSSEC_NOT_FOUND,             "not found" },
 
        { DNSSEC_PKCS8_IMPORT_ERROR,    "PKCS #8 import error" },

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

diff --git a/src/libknot/dnssec/key/key.c b/src/libknot/dnssec/key/key.c
index 633cdd0c87f4dd00917c337980f74957160b89f6..81952dd00315958072e13f36ce49e4fe32bce5b8 100644 (file)
--- a/src/libknot/dnssec/key/key.c
+++ b/src/libknot/dnssec/key/key.c
@@ -410,7 +410,7 @@ int dnssec_key_set_rdata(dnssec_key_t *key, const dnssec_binary_t *rdata)
        }
 
        if (rdata->size < DNSKEY_RDATA_MIN_SIZE) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        if (key->public_key) {

diff --git a/src/libknot/dnssec/key/keytag.c b/src/libknot/dnssec/key/keytag.c
index 653d30f48e2643b63043fe7d283db1b6cceb96dc..54623c851877e6cfe1b1e9e9c68700969f22d1b4 100644 (file)
--- a/src/libknot/dnssec/key/keytag.c
+++ b/src/libknot/dnssec/key/keytag.c
@@ -63,7 +63,7 @@ int dnssec_keytag(const dnssec_binary_t *rdata, uint16_t *keytag)
        }
 
        if (!rdata->data || rdata->size < DNSKEY_RDATA_OFFSET_PUBKEY) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        uint8_t algorithm = rdata->data[DNSKEY_RDATA_OFFSET_ALGORITHM];

diff --git a/src/libknot/dnssec/keystore/pkcs8.c b/src/libknot/dnssec/keystore/pkcs8.c
index 6b647a2779c1eebe9876157412a323a5f66b033f..51aabe7098583a99e5616b1ef5abfde9125741ed 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs8.c
+++ b/src/libknot/dnssec/keystore/pkcs8.c
@@ -122,7 +122,7 @@ static int pkcs8_dir_read(pkcs8_dir_handle_t *handle, const char *id, dnssec_bin
        }
 
        if (size == 0) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        // read the stored data
@@ -413,7 +413,7 @@ static int pkcs8_get_private(void *ctx, const char *id, gnutls_privkey_t *key_pt
        }
 
        if (size == 0) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        // read the stored data

diff --git a/src/libknot/dnssec/nsec/nsec.c b/src/libknot/dnssec/nsec/nsec.c
index 1cb563905b99cb556180bb8db13011e62cc8a5f7..14aee5659a62755e22d6db9992152ba729e26a8e 100644 (file)
--- a/src/libknot/dnssec/nsec/nsec.c
+++ b/src/libknot/dnssec/nsec/nsec.c
@@ -42,7 +42,7 @@ int dnssec_nsec3_params_from_rdata(dnssec_nsec3_params_t *params,
        wire_ctx_t wire = binary_init(rdata);
 
        if (wire_ctx_available(&wire) < 5) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        new_params.algorithm  = wire_ctx_read_u8(&wire);
@@ -51,7 +51,7 @@ int dnssec_nsec3_params_from_rdata(dnssec_nsec3_params_t *params,
        new_params.salt.size  = wire_ctx_read_u8(&wire);
 
        if (wire_ctx_available(&wire) != new_params.salt.size) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        new_params.salt.data = malloc(new_params.salt.size);

diff --git a/src/libknot/dnssec/sign/der.c b/src/libknot/dnssec/sign/der.c
index 9ab0c6118dcd7d655a7f16e021b4ca69fa24e08a..b94842d1dbc45396eb4b9cfd6e5dbd740e4735a9 100644 (file)
--- a/src/libknot/dnssec/sign/der.c
+++ b/src/libknot/dnssec/sign/der.c
@@ -43,7 +43,7 @@ static int asn1_decode_size(wire_ctx_t *wire, size_t *size)
        assert(size);
 
        if (wire_ctx_available(wire) < 1) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        uint8_t byte = wire_ctx_read_u8(wire);
@@ -66,7 +66,7 @@ static int asn1_decode_integer(wire_ctx_t *wire, dnssec_binary_t *_value)
        assert(_value);
 
        if (!asn1_expect_type(wire, ASN1_TYPE_INTEGER)) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        size_t size;
@@ -76,7 +76,7 @@ static int asn1_decode_integer(wire_ctx_t *wire, dnssec_binary_t *_value)
        }
 
        if (size == 0 || size > wire_ctx_available(wire)) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        dnssec_binary_t value = { .data = wire->position, .size = size };
@@ -137,7 +137,7 @@ int dss_sig_value_decode(const dnssec_binary_t *der,
        // decode the sequence
 
        if (!asn1_expect_type(&wire, ASN1_TYPE_SEQUENCE)) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        result = asn1_decode_size(&wire, &size);
@@ -146,7 +146,7 @@ int dss_sig_value_decode(const dnssec_binary_t *der,
        }
 
        if (size != wire_ctx_available(&wire)) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        // decode the 'r' and 's' values
@@ -164,7 +164,7 @@ int dss_sig_value_decode(const dnssec_binary_t *der,
        }
 
        if (wire_ctx_available(&wire) != 0) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        *r = der_r;

diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
index a00f0c0df8c666e88a4a895e4797a4d917db6c3a..18470087712f792749faad09a1bfce5b32603428 100644 (file)
--- a/src/libknot/dnssec/sign/sign.c
+++ b/src/libknot/dnssec/sign/sign.c
@@ -121,7 +121,7 @@ static int ecdsa_x509_to_dnssec(dnssec_sign_ctx_t *ctx,
        size_t s_size = bignum_size_u(&value_s);
 
        if (r_size > int_size || s_size > int_size) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        result = dnssec_binary_alloc(dnssec, 2 * int_size);

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 9b29578563c479dd954c9b18035b14e0e839e2c1..9193ec87959f5fc5d8283f66344dc144fffd7311 100644 (file)
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -199,7 +199,7 @@ int knot_error_from_libdnssec(int libdnssec_errcode)
        switch (libdnssec_errcode) {
        case DNSSEC_ERROR:
                return KNOT_ERROR;
-       case DNSSEC_MALFORMED_DATA:
+       case KNOT_EMALF:
                return KNOT_EMALF;
        case DNSSEC_NOT_FOUND:
                return KNOT_ENOENT;

diff --git a/src/utils/keymgr/bind_privkey.c b/src/utils/keymgr/bind_privkey.c
index d82f524eca3285f63f7b59d45b29185d47c01ef2..d9ba531ee121d54e6cecf6eac54b8810b5089af2 100644 (file)
--- a/src/utils/keymgr/bind_privkey.c
+++ b/src/utils/keymgr/bind_privkey.c
@@ -112,7 +112,7 @@ static int parse_time(char *string, void *_time)
 
        char *end = strptime(string, LEGACY_DATE_FORMAT, &tm);
        if (end == NULL || *end != '\0') {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        time_t *time = _time;
@@ -158,7 +158,7 @@ static int parse_line(bind_privkey_t *params, char *line, size_t length)
 
        char *separator = memchr(line, ':', length);
        if (!separator) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        char *key = line;
@@ -170,7 +170,7 @@ static int parse_line(bind_privkey_t *params, char *line, size_t length)
        strip(&value, &value_length);
 
        if (key_length == 0 || value_length == 0) {
-               return DNSSEC_MALFORMED_DATA;
+               return KNOT_EMALF;
        }
 
        key[key_length] = '\0';