3 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/x509/x509_ca.cpp b/src/lib/x509/x509_ca.cpp
index bc3763c5a..f7f5471f4 100644
--- a/src/lib/x509/x509_ca.cpp
+++ b/src/lib/x509/x509_ca.cpp
@@ -234,9 +234,6 @@ PK_Signer* choose_sig_format(const Private_Key& key,
 
    std::unique_ptr<HashFunction> hash(HashFunction::create_or_throw(hash_fn));
 
-   if(key.max_input_bits() < hash->output_length() * 8)
-      throw Invalid_Argument("Key is too small for chosen hash function");
-
    std::string padding;
    if(algo_name == "RSA")
       {
diff --git a/src/lib/x509/x509_ca.h b/src/lib/x509/x509_ca.h
index c96a709d5..5b5eb6fc8 100644
--- a/src/lib/x509/x509_ca.h
+++ b/src/lib/x509/x509_ca.h
@@ -12,7 +12,6 @@
 #include <botan/x509_crl.h>
 #include <botan/x509_ext.h>
 #include <botan/pkcs10.h>
-#include <botan/pubkey.h>
 
 #if defined(BOTAN_HAS_SYSTEM_RNG)
   #include <botan/system_rng.h>
@@ -20,6 +19,8 @@
 
 namespace Botan {
 
+class PK_Signer;
+
 /**
 * This class represents X.509 Certificate Authorities (CAs).
 */
diff --git a/src/lib/x509/x509self.cpp b/src/lib/x509/x509self.cpp
index a59632858..b59b45f6a 100644
--- a/src/lib/x509/x509self.cpp
+++ b/src/lib/x509/x509self.cpp
@@ -9,6 +9,7 @@
 #include <botan/x509_ext.h>
 #include <botan/x509_ca.h>
 #include <botan/der_enc.h>
+#include <botan/pubkey.h>
 #include <botan/oids.h>
 
 namespace Botan {