cleanup USE_EVP_RSA (RT #20044)

diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index c597a6beff6a38bec8c3fbdf112daa433ac746a5..69ea338310daa6ac67d5228ff611bcaaf0e52b62 100644 (file)
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.17 2009/09/03 04:09:58 marka Exp $ */
+/* $Id: dst_internal.h,v 1.18 2009/09/23 11:16:50 fdupont Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
@@ -100,7 +100,7 @@ struct dst_key {
                void *generic;
                gss_ctx_id_t gssctx;
 #ifdef OPENSSL
-#if USE_EVP_RSA
+#if !defined(USE_EVP) || !USE_EVP
                RSA *rsa;
 #endif
                DSA *dsa;

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 828ca3bd6f54c42175461e0fbfd04725395d79a4..13f6b944be6f3550b6e018fb2011296aced9102f 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -17,15 +17,12 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.27 2009/09/07 12:54:59 fdupont Exp $
+ * $Id: opensslrsa_link.c,v 1.28 2009/09/23 11:16:50 fdupont Exp $
  */
 #ifdef OPENSSL
 #ifndef USE_EVP
 #define USE_EVP 1
 #endif
-#if USE_EVP
-#define USE_EVP_RSA 1
-#endif
 
 #include <config.h>