mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

functions can now return DST_R_NOCRYPTO

Browse Source
This commit is contained in:
Brian Wellington
2001-07-10 19:05:53 +00:00
parent cda383abe0
commit 3b31ce9da9
1 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/dns/sec/dst/dst_api.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.86 2001/07/10 05:12:43 bwelling Exp $ * $Id: dst_api.c,v 1.87 2001/07/10 19:05:53 bwelling Exp $
*/ */
#include <config.h> #include <config.h>
@@ -87,6 +87,8 @@ static isc_result_t frombuffer(dns_name_t *name,
isc_mem_t *mctx, isc_mem_t *mctx,
dst_key_t **keyp); dst_key_t **keyp);
static isc_result_t algorithm_status(unsigned int alg);
#define RETERR(x) \ #define RETERR(x) \
do { \ do { \
result = (x); \ result = (x); \
@@ -94,6 +96,14 @@ static isc_result_t frombuffer(dns_name_t *name,
goto out; \ goto out; \
} while (0) } while (0)
#define CHECKALG(alg) \
do { \
isc_result_t _r; \
_r = algorithm_status(alg); \
if (_r != ISC_R_SUCCESS) \
return (_r); \
} while (0); \
isc_result_t isc_result_t
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags) { dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags) {
isc_result_t result; isc_result_t result;
@@ -232,8 +242,7 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) {
REQUIRE(VALID_CTX(dctx)); REQUIRE(VALID_CTX(dctx));
REQUIRE(sig != NULL); REQUIRE(sig != NULL);
if (dst_algorithm_supported(dctx->key->key_alg) == ISC_FALSE) CHECKALG(dctx->key->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (dctx->key->opaque == NULL) if (dctx->key->opaque == NULL)
return (DST_R_NULLKEY); return (DST_R_NULLKEY);
if (dctx->key->func->sign == NULL) if (dctx->key->func->sign == NULL)
@@ -247,8 +256,7 @@ dst_context_verify(dst_context_t *dctx, isc_region_t *sig) {
REQUIRE(VALID_CTX(dctx)); REQUIRE(VALID_CTX(dctx));
REQUIRE(sig != NULL); REQUIRE(sig != NULL);
if (dst_algorithm_supported(dctx->key->key_alg) == ISC_FALSE) CHECKALG(dctx->key->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (dctx->key->opaque == NULL) if (dctx->key->opaque == NULL)
return (DST_R_NULLKEY); return (DST_R_NULLKEY);
if (dctx->key->func->verify == NULL) if (dctx->key->func->verify == NULL)
@@ -265,9 +273,8 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv,
REQUIRE(VALID_KEY(pub) && VALID_KEY(priv)); REQUIRE(VALID_KEY(pub) && VALID_KEY(priv));
REQUIRE(secret != NULL); REQUIRE(secret != NULL);
if (dst_algorithm_supported(pub->key_alg) == ISC_FALSE || CHECKALG(pub->key_alg);
dst_algorithm_supported(priv->key_alg) == ISC_FALSE) CHECKALG(priv->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (pub->opaque == NULL || priv->opaque == NULL) if (pub->opaque == NULL || priv->opaque == NULL)
return (DST_R_NULLKEY); return (DST_R_NULLKEY);
@@ -291,8 +298,7 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory) {
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
REQUIRE((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0); REQUIRE((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0);
if (dst_algorithm_supported(key->key_alg) == ISC_FALSE) CHECKALG(key->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (key->func->tofile == NULL) if (key->func->tofile == NULL)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
@@ -326,8 +332,7 @@ dst_key_fromfile(dns_name_t *name, dns_keytag_t id,
REQUIRE(mctx != NULL); REQUIRE(mctx != NULL);
REQUIRE(keyp != NULL && *keyp == NULL); REQUIRE(keyp != NULL && *keyp == NULL);
if (dst_algorithm_supported(alg) == ISC_FALSE) CHECKALG(alg);
return (DST_R_UNSUPPORTEDALG);
isc_buffer_init(&b, filename, sizeof filename); isc_buffer_init(&b, filename, sizeof filename);
result = buildfilename(name, id, alg, type, directory, &b); result = buildfilename(name, id, alg, type, directory, &b);
@@ -430,8 +435,7 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) {
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
REQUIRE(target != NULL); REQUIRE(target != NULL);
if (dst_algorithm_supported(key->key_alg) == ISC_FALSE) CHECKALG(key->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (key->func->todns == NULL) if (key->func->todns == NULL)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
@@ -477,8 +481,7 @@ dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass,
proto = isc_buffer_getuint8(source); proto = isc_buffer_getuint8(source);
alg = isc_buffer_getuint8(source); alg = isc_buffer_getuint8(source);
if (!dst_algorithm_supported(alg)) CHECKALG(alg);
return (DST_R_UNSUPPORTEDALG);
id = dst_region_computeid(&r, alg); id = dst_region_computeid(&r, alg);
@@ -510,8 +513,7 @@ dst_key_frombuffer(dns_name_t *name, unsigned int alg,
REQUIRE(dst_initialized); REQUIRE(dst_initialized);
if (!dst_algorithm_supported(alg)) CHECKALG(alg);
return (DST_R_UNSUPPORTEDALG);
result = frombuffer(name, alg, flags, protocol, rdclass, source, result = frombuffer(name, alg, flags, protocol, rdclass, source,
mctx, &key); mctx, &key);
@@ -534,8 +536,7 @@ dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) {
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
REQUIRE(target != NULL); REQUIRE(target != NULL);
if (dst_algorithm_supported(key->key_alg) == ISC_FALSE) CHECKALG(key->key_alg);
return (DST_R_UNSUPPORTEDALG);
if (key->func->todns == NULL) if (key->func->todns == NULL)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
@@ -576,8 +577,7 @@ dst_key_generate(dns_name_t *name, unsigned int alg,
REQUIRE(mctx != NULL); REQUIRE(mctx != NULL);
REQUIRE(keyp != NULL && *keyp == NULL); REQUIRE(keyp != NULL && *keyp == NULL);
if (dst_algorithm_supported(alg) == ISC_FALSE) CHECKALG(alg);
return (DST_R_UNSUPPORTEDALG);
key = get_key_struct(name, alg, flags, protocol, bits, rdclass, mctx); key = get_key_struct(name, alg, flags, protocol, bits, rdclass, mctx);
if (key == NULL) if (key == NULL)
@@ -1056,6 +1056,17 @@ frombuffer(dns_name_t *name, unsigned int alg, unsigned int flags,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
static isc_result_t
algorithm_status(unsigned int alg) {
REQUIRE(dst_initialized == ISC_TRUE);
#ifndef OPENSSL
if (alg == DST_ALG_RSA || alg == DST_ALG_DSA || alg == DST_ALG_DH)
return (DST_R_NOCRYPTO);
#endif
return (dst_algorithm_supported(alg));
}
isc_result_t isc_result_t
dst__file_addsuffix(char *filename, unsigned int len, dst__file_addsuffix(char *filename, unsigned int len,
const char *ofilename, const char *suffix) const char *ofilename, const char *suffix)