New Configure option no-<cipher> (rsa, idea, rc5, ...).
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index 9487b6f..96480f4 100644
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -67,7 +67,7 @@
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-	$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index f006b89..2f53ff0 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -66,6 +66,10 @@
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 
+#ifdef NO_RSA
+#error RSA is disabled.
+#endif
+
 typedef struct rsa_st RSA;
 
 typedef struct rsa_meth_st
diff --git a/crypto/rsa/rsa_oaep_test.c b/crypto/rsa/rsa_oaep_test.c
index 4005aa5..4dd078d 100644
--- a/crypto/rsa/rsa_oaep_test.c
+++ b/crypto/rsa/rsa_oaep_test.c
@@ -3,8 +3,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/e_os.h>
-#include <openssl/rsa.h>
 #include <openssl/err.h>
+#ifdef NO_RSA
+int main(int argc, char *argv[])
+{
+    printf("No RSA support\n");
+    return(0);
+}
+#else
+#include <openssl/rsa.h>
 
 #define SetKey \
   key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
@@ -291,3 +298,4 @@
 	}
     return err;
     }
+#endif