Replace DNSSEC_KEY_GENERATE_ERROR with KNOT_KEY_EGENERATE

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 7771660eb3583cac028728aa7ca134f37b8d62a5..1f56729b1d541c87fe1c548c85b43f9c657ba420 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -28,7 +28,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { KNOT_KEY_EIMPORT,     "PKCS #8 import error" },
        { KNOT_KEY_EEXPORT,     "key export error" },
        { KNOT_KEY_EIMPORT,     "key import error" },
-       { DNSSEC_KEY_GENERATE_ERROR,    "key generation error" },
+       { KNOT_KEY_EGENERATE,   "key generation error" },
 
        { DNSSEC_INVALID_PUBLIC_KEY,    "invalid public key" },
        { DNSSEC_INVALID_PRIVATE_KEY,   "invalid private key" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index adff602d795e6f66db68127d70aa940815785c39..3693c912ac4e967bfb348a0deaa792dacb45eb24 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -40,7 +40,7 @@ enum dnssec_error {
        KNOT_KEY_EIMPORT,
        KNOT_KEY_EEXPORT,
        KNOT_KEY_EIMPORT,
-       DNSSEC_KEY_GENERATE_ERROR,
+       KNOT_KEY_EGENERATE,
 
        DNSSEC_INVALID_PUBLIC_KEY,
        DNSSEC_INVALID_PRIVATE_KEY,

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index 021320c8552f3c8412225ef798202b5325031934..d209e81a85c455cbc913a4988aa02fb910459ae6 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -200,7 +200,7 @@ static int pkcs11_generate_key(void *_ctx, gnutls_pk_algorithm_t algorithm,
        int r = gnutls_pkcs11_privkey_generate3(ctx->url, algorithm, bits, label,
                                                &gt_cka_id, 0, NULL, 0, flags);
        if (r != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_GENERATE_ERROR;
+               return KNOT_KEY_EGENERATE;
        }
 
        char *id = bin_to_hex(cka_id.data, cka_id.size, false);

diff --git a/src/libknot/dnssec/keystore/pkcs8.c b/src/libknot/dnssec/keystore/pkcs8.c
index c13eda230b581507f6da346929225a14ad6751ac..d404c40312653aaf882880b7b3db714ac3884566 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs8.c
+++ b/src/libknot/dnssec/keystore/pkcs8.c
@@ -181,7 +181,7 @@ static int pem_generate(gnutls_pk_algorithm_t algorithm, unsigned bits,
 
        r = gnutls_x509_privkey_generate(key, algorithm, bits, 0);
        if (r != GNUTLS_E_SUCCESS) {
-               return DNSSEC_KEY_GENERATE_ERROR;
+               return KNOT_KEY_EGENERATE;
        }
 
        // convert to PEM and export the ID