10 files changed, 17 insertions, 37 deletions
diff --git a/src/lib/block/openssl_block/info.txt b/src/lib/block/openssl_block/info.txt
deleted file mode 100644
index 62feaac95..000000000
--- a/src/lib/block/openssl_block/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define OPENSSL_BLOCK_CIPHER 20151019
-
-<requires>
-openssl
-</requires>
diff --git a/src/lib/hash/openssl_hash/info.txt b/src/lib/hash/openssl_hash/info.txt
deleted file mode 100644
index c375d272e..000000000
--- a/src/lib/hash/openssl_hash/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define OPENSSL_HASH_FUNCTION 20151019
-
-<requires>
-openssl
-</requires>
diff --git a/src/lib/prov/openssl/info.txt b/src/lib/prov/openssl/info.txt
new file mode 100644
index 000000000..8d65d524c
--- /dev/null
+++ b/src/lib/prov/openssl/info.txt
@@ -0,0 +1,11 @@
+define OPENSSL 20151219
+
+load_on vendor
+
+<header:internal>
+openssl.h
+</header:internal>
+
+<libs>
+all -> crypto
+</libs>
diff --git a/src/lib/utils/openssl/openssl.h b/src/lib/prov/openssl/openssl.h
index 05d3e953f..05d3e953f 100644
--- a/src/lib/utils/openssl/openssl.h
+++ b/src/lib/prov/openssl/openssl.h
diff --git a/src/lib/block/openssl_block/openssl_block.cpp b/src/lib/prov/openssl/openssl_block.cpp
index a35919e3a..a35919e3a 100644
--- a/src/lib/block/openssl_block/openssl_block.cpp
+++ b/src/lib/prov/openssl/openssl_block.cpp
diff --git a/src/lib/pubkey/ecdsa/openssl_ecdsa.cpp b/src/lib/prov/openssl/openssl_ecdsa.cpp
index 502702804..8b1af24db 100644
--- a/src/lib/pubkey/ecdsa/openssl_ecdsa.cpp
+++ b/src/lib/prov/openssl/openssl_ecdsa.cpp
@@ -5,14 +5,10 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/build.h>
-
-#if defined(BOTAN_HAS_OPENSSL)
-
 #include <botan/internal/openssl.h>
 #include <openssl/x509.h>
 
-#if !defined(OPENSSL_NO_ECDSA)
+#if defined(BOTAN_HAS_ECDSA) && !defined(OPENSSL_NO_ECDSA)
 
 #include <botan/der_enc.h>
 #include <botan/ecdsa.h>
@@ -209,5 +205,3 @@ BOTAN_REGISTER_TYPE(PK_Ops::Signature, OpenSSL_ECDSA_Signing_Operation, "ECDSA",
 }
 
 #endif
-
-#endif
diff --git a/src/lib/hash/openssl_hash/openssl_hash.cpp b/src/lib/prov/openssl/openssl_hash.cpp
index c89dd777d..c89dd777d 100644
--- a/src/lib/hash/openssl_hash/openssl_hash.cpp
+++ b/src/lib/prov/openssl/openssl_hash.cpp
diff --git a/src/lib/stream/rc4/openssl_rc4.cpp b/src/lib/prov/openssl/openssl_rc4.cpp
index 84d739c91..84d739c91 100644
--- a/src/lib/stream/rc4/openssl_rc4.cpp
+++ b/src/lib/prov/openssl/openssl_rc4.cpp
diff --git a/src/lib/pubkey/rsa/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp
index a25c8552e..e3c0c0fec 100644
--- a/src/lib/pubkey/rsa/openssl_rsa.cpp
+++ b/src/lib/prov/openssl/openssl_rsa.cpp
@@ -5,13 +5,14 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/rsa.h>
+#include <botan/internal/openssl.h>
 
-#if defined(BOTAN_HAS_OPENSSL)
+#if defined(BOTAN_HAS_RSA)
 
-#include <botan/internal/openssl.h>
+#include <botan/rsa.h>
 #include <botan/internal/pk_utils.h>
 #include <botan/internal/ct_utils.h>
+
 #include <functional>
 #include <memory>
 
@@ -280,4 +281,4 @@ BOTAN_REGISTER_TYPE(PK_Ops::Decryption, OpenSSL_RSA_Decryption_Operation, "RSA",
 
 }
 
-#endif // BOTAN_HAS_OPENSSL
+#endif // BOTAN_HAS_RSA
diff --git a/src/lib/utils/openssl/info.txt b/src/lib/utils/openssl/info.txt
deleted file mode 100644
index 13ea92cbf..000000000
--- a/src/lib/utils/openssl/info.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-define OPENSSL 20150829
-
-# This base module doesn't have any code, but other code using openssl
-# rely on it either macro check for BOTAN_HAS_OPENSSL or a module
-# dependency on openssl to test for the existence of and desire to use
-# OpenSSL for certain operations.
-
-load_on vendor
-
-<header:internal>
-openssl.h
-</header:internal>
-
-<libs>
-all -> crypto
-</libs>