Replace DNSSEC_P11_FAILED_TO_LOAD_MODULE with KNOT_P11_ELOAD

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 948a337b6ed356ea3a809a9934618766032694a0..90d6db0b619c0ba250a8f89590e5d20972dc5173 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -53,7 +53,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 
        { KNOT_EINVAL,  "invalid KASP keystore configuration" },
 
-       { DNSSEC_P11_FAILED_TO_LOAD_MODULE, "failed to load PKCS #11 module" },
+       { KNOT_P11_ELOAD, "failed to load PKCS #11 module" },
        { DNSSEC_P11_TOO_MANY_MODULES,      "too many PKCS #11 modules loaded" },
        { DNSSEC_P11_TOKEN_NOT_AVAILABLE,   "PKCS #11 token not available" },
 

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index 5926a3d4d93a7dfa60d0f15f801b94b891b858d3..d76e5c37ac4137896be942cc3e0e847ddf40b54b 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -65,7 +65,7 @@ enum dnssec_error {
 
        KNOT_EINVAL,
 
-       DNSSEC_P11_FAILED_TO_LOAD_MODULE,
+       KNOT_P11_ELOAD,
        DNSSEC_P11_TOO_MANY_MODULES,
        DNSSEC_P11_TOKEN_NOT_AVAILABLE,
 

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index b840e112d6ece5357dc93566547f7c01b4dc22fe..a6e3c7b14fed9d1322fafc7ef22efc4f4c8f9e74 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -113,7 +113,7 @@ static int safe_open(const char *config, char **url_ptr)
        free(module);
        if (r != GNUTLS_E_SUCCESS) {
                free(url);
-               return DNSSEC_P11_FAILED_TO_LOAD_MODULE;
+               return KNOT_P11_ELOAD;
        }
 
        unsigned int flags = 0;

diff --git a/src/libknot/dnssec/p11/p11.c b/src/libknot/dnssec/p11/p11.c
index cf2d5093c54125f3e4daa4f5b3a142bbec7f1fde..ef7735517f9ea90105510a7c2f575c986b179b3b 100644 (file)
--- a/src/libknot/dnssec/p11/p11.c
+++ b/src/libknot/dnssec/p11/p11.c
@@ -56,7 +56,7 @@ int p11_load_module(const char *module)
        int r = gnutls_pkcs11_add_provider(module, NULL);
        if (r != GNUTLS_E_SUCCESS) {
                free(copy);
-               return DNSSEC_P11_FAILED_TO_LOAD_MODULE;
+               return KNOT_P11_ELOAD;
        }
 
        pkcs11_modules[pkcs11_modules_count] = copy;

diff --git a/src/libknot/errcode.h b/src/libknot/errcode.h
index 0f611fbef64e99649107d83e13d15d4f0f881b93..af6205535413592caaf2bff3bc7e5f7c54f9b0b8 100644 (file)
--- a/src/libknot/errcode.h
+++ b/src/libknot/errcode.h
@@ -181,6 +181,7 @@ enum knot_error {
        KNOT_KEY_EGENERATE,
        KNOT_EALGORITHM,
        KNOT_ECRYPTO,
+       KNOT_P11_ELOAD,
        KNOT_P11_ECONFIG,
 
        KNOT_ERROR_MAX = -501

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 3450d58bafc0b7c63c74a14bffe463a5b35981f0..af2c622c58927f4a313e8649150c8c9d243e0ca9 100644 (file)
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -180,6 +180,7 @@ static const struct error errors[] = {
        { KNOT_KEY_EGENERATE,          "failed to generate key" },
        { KNOT_EALGORITHM,             "invalid hash algorithm" },
        { KNOT_ECRYPTO,                "crypto operation failed" },
+       { KNOT_P11_ELOAD,              "failed to load PKCS #11 module" },
        { KNOT_P11_ECONFIG,            "invalid PKCS #11 configuration" },
 
        /* Terminator */