From: Daniel Salzman Date: Tue, 21 Oct 2025 08:13:16 +0000 (+0200) Subject: Replace DNSSEC_KEY_GENERATE_ERROR with KNOT_KEY_EGENERATE X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d97430699f23f211dc5c1fc2eb3a63945756255;p=thirdparty%2Fknot-dns.git Replace DNSSEC_KEY_GENERATE_ERROR with KNOT_KEY_EGENERATE --- diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c index 7771660eb3..1f56729b1d 100644 --- 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 adff602d79..3693c912ac 100644 --- 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 021320c855..d209e81a85 100644 --- 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, >_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 c13eda230b..d404c40312 100644 --- 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