From f84e9848831be0a66c2a80c940ab1d5aad467ab4 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Tue, 21 Oct 2025 10:22:52 +0200 Subject: [PATCH] Replace DNSSEC_NO_PRIVATE_KEY with KNOT_NO_PRIVATE_KEY --- src/libknot/dnssec/error.c | 2 +- src/libknot/dnssec/error.h | 2 +- src/libknot/dnssec/keystore/keystore.c | 2 +- src/libknot/dnssec/sign/sign.c | 2 +- src/libknot/error.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c index 455930e96d..9c21ddf6f4 100644 --- a/src/libknot/dnssec/error.c +++ b/src/libknot/dnssec/error.c @@ -38,7 +38,7 @@ static const error_message_t ERROR_MESSAGES[] = { { KNOT_INVALID_KEY_NAME, "invalid key name" }, { KNOT_NO_PUBLIC_KEY, "no public key" }, - { DNSSEC_NO_PRIVATE_KEY, "no private key" }, + { KNOT_NO_PRIVATE_KEY, "no private key" }, { DNSSEC_KEY_ALREADY_PRESENT, "key already present" }, { DNSSEC_SIGN_INIT_ERROR, "signing initialization error" }, diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h index 41e8f72926..f71d794c4e 100644 --- a/src/libknot/dnssec/error.h +++ b/src/libknot/dnssec/error.h @@ -50,7 +50,7 @@ enum dnssec_error { KNOT_INVALID_KEY_NAME, KNOT_NO_PUBLIC_KEY, - DNSSEC_NO_PRIVATE_KEY, + KNOT_NO_PRIVATE_KEY, DNSSEC_KEY_ALREADY_PRESENT, DNSSEC_SIGN_INIT_ERROR, diff --git a/src/libknot/dnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c index e73bb69287..55e583f6a4 100644 --- a/src/libknot/dnssec/keystore/keystore.c +++ b/src/libknot/dnssec/keystore/keystore.c @@ -168,7 +168,7 @@ int dnssec_keystore_set_private(dnssec_keystore_t *store, dnssec_key_t *key) } if (!key->private_key) { - return DNSSEC_NO_PRIVATE_KEY; + return KNOT_NO_PRIVATE_KEY; } return store->functions->set_private(store->ctx, key->private_key); diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c index f531084058..fcd60279f1 100644 --- a/src/libknot/dnssec/sign/sign.c +++ b/src/libknot/dnssec/sign/sign.c @@ -306,7 +306,7 @@ int dnssec_sign_write(dnssec_sign_ctx_t *ctx, dnssec_sign_flags_t flags, dnssec_ } if (!dnssec_key_can_sign(ctx->key)) { - return DNSSEC_NO_PRIVATE_KEY; + return KNOT_NO_PRIVATE_KEY; } gnutls_datum_t data = { diff --git a/src/libknot/error.c b/src/libknot/error.c index 1da0c8520e..aaae64924f 100644 --- a/src/libknot/error.c +++ b/src/libknot/error.c @@ -207,7 +207,7 @@ int knot_error_from_libdnssec(int libdnssec_errcode) case KNOT_ENOENT: return KNOT_ENOENT; case KNOT_NO_PUBLIC_KEY: - case DNSSEC_NO_PRIVATE_KEY: + case KNOT_NO_PRIVATE_KEY: return KNOT_DNSSEC_ENOKEY; // EOK, EINVAL, ENOMEM and ENOENT are identical, no need to translate case KNOT_INVALID_PUBLIC_KEY ... KNOT_INVALID_KEY_NAME: -- 2.47.3