Replace DNSSEC_KEY_EXPORT_ERROR with KNOT_KEY_EEXPORT

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 58e33b03e505d1dec697ca3ab6d16dc15d730d49..7771660eb3583cac028728aa7ca134f37b8d62a5 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -26,7 +26,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { KNOT_ENOENT,          "not found" },
 
        { KNOT_KEY_EIMPORT,     "PKCS #8 import error" },
-       { DNSSEC_KEY_EXPORT_ERROR,      "key export error" },
+       { KNOT_KEY_EEXPORT,     "key export error" },
        { KNOT_KEY_EIMPORT,     "key import error" },
        { DNSSEC_KEY_GENERATE_ERROR,    "key generation error" },
 

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index af64eedfe5e02efee211cea3bfc8e23544b41f6b..adff602d795e6f66db68127d70aa940815785c39 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -38,7 +38,7 @@ enum dnssec_error {
        KNOT_ENOENT,
 
        KNOT_KEY_EIMPORT,
-       DNSSEC_KEY_EXPORT_ERROR,
+       KNOT_KEY_EEXPORT,
        KNOT_KEY_EIMPORT,
        DNSSEC_KEY_GENERATE_ERROR,
 

diff --git a/src/libknot/dnssec/key/convert.c b/src/libknot/dnssec/key/convert.c
index c728a0dae52b1ed8f641913ac578da5c4b265965..d25a50bed1f8d18e13276b9f1b8282e435d06f4b 100644 (file)
--- a/src/libknot/dnssec/key/convert.c
+++ b/src/libknot/dnssec/key/convert.c
@@ -57,12 +57,12 @@ static int rsa_pubkey_to_rdata(gnutls_pubkey_t key, dnssec_binary_t *rdata)
 
        int result = gnutls_pubkey_get_pk_rsa_raw(key, &modulus, &exponent);
        if (result != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        size_t exponent_size = bignum_size_u_datum(&exponent);
        if (exponent_size > UINT8_MAX) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        size_t modulus_size = bignum_size_u_datum(&modulus);
@@ -118,7 +118,7 @@ static int ecdsa_pubkey_to_rdata(gnutls_pubkey_t key, dnssec_binary_t *rdata)
 
        int result = gnutls_pubkey_get_pk_ecc_raw(key, &curve, &point_x, &point_y);
        if (result != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        size_t point_size = ecdsa_curve_point_size(curve);
@@ -152,7 +152,7 @@ static int eddsa_pubkey_to_rdata(gnutls_pubkey_t key, dnssec_binary_t *rdata)
 
        int result = gnutls_pubkey_get_pk_ecc_raw(key, &curve, &point_x, NULL);
        if (result != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        size_t point_size = eddsa_curve_point_size(curve);

diff --git a/src/libknot/dnssec/pem.c b/src/libknot/dnssec/pem.c
index 13b6a5f0e469c009ede70d1130c62b45a8523135..3ba526560336d4ea796ff9207a9ee9c7da665af2 100644 (file)
--- a/src/libknot/dnssec/pem.c
+++ b/src/libknot/dnssec/pem.c
@@ -98,7 +98,7 @@ int dnssec_pem_from_x509(gnutls_x509_privkey_t key, dnssec_binary_t *pem)
        dnssec_binary_t _pem = { 0 };
        int r = try_export_pem(key, &_pem);
        if (r != GNUTLS_E_SHORT_MEMORY_BUFFER || _pem.size == 0) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        r = dnssec_binary_alloc(&_pem, _pem.size);
@@ -109,7 +109,7 @@ int dnssec_pem_from_x509(gnutls_x509_privkey_t key, dnssec_binary_t *pem)
        r = try_export_pem(key, &_pem);
        if (r != GNUTLS_E_SUCCESS) {
                dnssec_binary_free(&_pem);
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        *pem = _pem;
@@ -120,7 +120,7 @@ int dnssec_pem_from_x509(gnutls_x509_privkey_t key, dnssec_binary_t *pem)
 static int privkey_export_x509(gnutls_privkey_t key, gnutls_x509_privkey_t *_key)
 {
        if (gnutls_privkey_export_x509(key, _key) != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_EXPORT_ERROR;
+               return KNOT_KEY_EEXPORT;
        }
 
        return KNOT_EOK;