From 3b31ce9da91aba294c2606d54462aba7c26b4e7f Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Tue, 10 Jul 2001 19:05:53 +0000
Subject: [PATCH] functions can now return DST_R_NOCRYPTO

---
 lib/dns/sec/dst/dst_api.c | 55 +++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/lib/dns/sec/dst/dst_api.c b/lib/dns/sec/dst/dst_api.c
index 8ab0bfc6c8..de57026d54 100644
--- a/lib/dns/sec/dst/dst_api.c
+++ b/lib/dns/sec/dst/dst_api.c
@@ -19,7 +19,7 @@
 
 /*
  * 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>
@@ -87,6 +87,8 @@ static isc_result_t	frombuffer(dns_name_t *name,
 				   isc_mem_t *mctx,
 				   dst_key_t **keyp);
 
+static isc_result_t	algorithm_status(unsigned int alg);
+
 #define RETERR(x) 				\
 	do {					\
 		result = (x);			\
@@ -94,6 +96,14 @@ static isc_result_t	frombuffer(dns_name_t *name,
 			goto out;		\
 	} 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
 dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags) {
 	isc_result_t result;
@@ -232,8 +242,7 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	REQUIRE(VALID_CTX(dctx));
 	REQUIRE(sig != NULL);
 
-	if (dst_algorithm_supported(dctx->key->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(dctx->key->key_alg);
 	if (dctx->key->opaque == NULL)
 		return (DST_R_NULLKEY);
 	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(sig != NULL);
 
-	if (dst_algorithm_supported(dctx->key->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(dctx->key->key_alg);
 	if (dctx->key->opaque == NULL)
 		return (DST_R_NULLKEY);
 	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(secret != NULL);
 
-	if (dst_algorithm_supported(pub->key_alg)  == ISC_FALSE ||
-	    dst_algorithm_supported(priv->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(pub->key_alg);
+	CHECKALG(priv->key_alg);
 
 	if (pub->opaque == NULL || priv->opaque == NULL)
 		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((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0);
 
-	if (dst_algorithm_supported(key->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(key->key_alg);
 
 	if (key->func->tofile == NULL)
 		return (DST_R_UNSUPPORTEDALG);
@@ -326,8 +332,7 @@ dst_key_fromfile(dns_name_t *name, dns_keytag_t id,
 	REQUIRE(mctx != NULL);
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
-	if (dst_algorithm_supported(alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(alg);
 
 	isc_buffer_init(&b, filename, sizeof filename);
 	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(target != NULL);
 
-	if (dst_algorithm_supported(key->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(key->key_alg);
 
 	if (key->func->todns == NULL)
 		return (DST_R_UNSUPPORTEDALG);
@@ -477,8 +481,7 @@ dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass,
 	proto = isc_buffer_getuint8(source);
 	alg = isc_buffer_getuint8(source);
 
-	if (!dst_algorithm_supported(alg))
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(alg);
 
 	id = dst_region_computeid(&r, alg);
 
@@ -510,8 +513,7 @@ dst_key_frombuffer(dns_name_t *name, unsigned int alg,
 
 	REQUIRE(dst_initialized);
 
-	if (!dst_algorithm_supported(alg))
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(alg);
 
 	result = frombuffer(name, alg, flags, protocol, rdclass, source,
 			    mctx, &key);
@@ -534,8 +536,7 @@ dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) {
 	REQUIRE(VALID_KEY(key));
 	REQUIRE(target != NULL);
 
-	if (dst_algorithm_supported(key->key_alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(key->key_alg);
 
 	if (key->func->todns == NULL)
 		return (DST_R_UNSUPPORTEDALG);
@@ -576,8 +577,7 @@ dst_key_generate(dns_name_t *name, unsigned int alg,
 	REQUIRE(mctx != NULL);
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
-	if (dst_algorithm_supported(alg) == ISC_FALSE)
-		return (DST_R_UNSUPPORTEDALG);
+	CHECKALG(alg);
 
 	key = get_key_struct(name, alg, flags, protocol, bits, rdclass, mctx);
 	if (key == NULL)
@@ -1056,6 +1056,17 @@ frombuffer(dns_name_t *name, unsigned int alg, unsigned int flags,
 	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
 dst__file_addsuffix(char *filename, unsigned int len,
 	  const char *ofilename, const char *suffix)