29 files changed, 6 insertions, 51 deletions
diff --git a/checks/x509.cpp b/checks/x509.cpp
index 59bc8444b..6041d975d 100644
--- a/checks/x509.cpp
+++ b/checks/x509.cpp
@@ -19,7 +19,7 @@
   #include <botan/ecdsa.h>
 #endif
 
-#ifdef BOTAN_HAS_X509
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
   #include <botan/x509self.h>
   #include <botan/x509stor.h>
   #include <botan/x509_ca.h>
@@ -34,7 +34,9 @@ using namespace Botan;
 #include "validate.h"
 #include "common.h"
 
-#if defined(BOTAN_HAS_X509) && defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_DSA)
+#if defined(BOTAN_HAS_X509_CERTIFICATES) && \
+    defined(BOTAN_HAS_RSA) && \
+    defined(BOTAN_HAS_DSA)
 
 namespace {
 
diff --git a/src/cert/cvc/cvc_self.h b/src/cert/cvc/cvc_self.h
index f7bf6d5d8..1e6bbe49a 100644
--- a/src/cert/cvc/cvc_self.h
+++ b/src/cert/cvc/cvc_self.h
@@ -10,7 +10,6 @@
 #define BOTAN_CVC_EAC_SELF_H__
 
 #include <botan/pkcs8.h>
-#include <botan/pkcs10.h>
 #include <botan/cvc_cert.h>
 #include <botan/ecdsa.h>
 #include <botan/asn1_obj.h>
diff --git a/src/cert/cvc/info.txt b/src/cert/cvc/info.txt
index 0d5687770..c42d909b5 100644
--- a/src/cert/cvc/info.txt
+++ b/src/cert/cvc/info.txt
@@ -34,5 +34,4 @@ libstate
 oid_lookup
 pem
 pubkey
-x509
 </requires>
diff --git a/src/cert/x509/pkcs10.cpp b/src/cert/pkcs10/pkcs10.cpp
index 81bb58555..81bb58555 100644
--- a/src/cert/x509/pkcs10.cpp
+++ b/src/cert/pkcs10/pkcs10.cpp
diff --git a/src/cert/x509/pkcs10.h b/src/cert/pkcs10/pkcs10.h
index d1be9e0d3..d1be9e0d3 100644
--- a/src/cert/x509/pkcs10.h
+++ b/src/cert/pkcs10/pkcs10.h
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
deleted file mode 100644
index 510163e69..000000000
--- a/src/cert/x509/info.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-define X509
-
-load_on auto
-
-<header:public>
-certstor.h
-crl_ent.h
-pkcs10.h
-x509_ca.h
-x509_crl.h
-x509_ext.h
-x509_obj.h
-x509cert.h
-x509find.h
-x509self.h
-x509stor.h
-</header:public>
-
-<source>
-certstor.cpp
-crl_ent.cpp
-pkcs10.cpp
-x509_ca.cpp
-x509_crl.cpp
-x509_ext.cpp
-x509_obj.cpp
-x509cert.cpp
-x509find.cpp
-x509opt.cpp
-x509self.cpp
-x509stor.cpp
-</source>
-
-<requires>
-asn1
-bigint
-datastor
-filters
-libstate
-oid_lookup
-pem
-pubkey
-rng
-sha1
-</requires>
diff --git a/src/cert/x509/x509_ca.cpp b/src/cert/x509ca/x509_ca.cpp
index ea7f3a405..ea7f3a405 100644
--- a/src/cert/x509/x509_ca.cpp
+++ b/src/cert/x509ca/x509_ca.cpp
diff --git a/src/cert/x509/x509_ca.h b/src/cert/x509ca/x509_ca.h
index 97be6a415..97be6a415 100644
--- a/src/cert/x509/x509_ca.h
+++ b/src/cert/x509ca/x509_ca.h
diff --git a/src/cert/x509/x509_ext.cpp b/src/cert/x509cert/x509_ext.cpp
index bb4bc1775..bb4bc1775 100644
--- a/src/cert/x509/x509_ext.cpp
+++ b/src/cert/x509cert/x509_ext.cpp
diff --git a/src/cert/x509/x509_ext.h b/src/cert/x509cert/x509_ext.h
index 213a077a2..213a077a2 100644
--- a/src/cert/x509/x509_ext.h
+++ b/src/cert/x509cert/x509_ext.h
diff --git a/src/cert/x509/x509_obj.cpp b/src/cert/x509cert/x509_obj.cpp
index ffee74f12..ffee74f12 100644
--- a/src/cert/x509/x509_obj.cpp
+++ b/src/cert/x509cert/x509_obj.cpp
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509cert/x509_obj.h
index 28ee95073..28ee95073 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509cert/x509_obj.h
diff --git a/src/cert/x509/x509cert.cpp b/src/cert/x509cert/x509cert.cpp
index 05f23298b..05f23298b 100644
--- a/src/cert/x509/x509cert.cpp
+++ b/src/cert/x509cert/x509cert.cpp
diff --git a/src/cert/x509/x509cert.h b/src/cert/x509cert/x509cert.h
index dc7ef4dbb..dc7ef4dbb 100644
--- a/src/cert/x509/x509cert.h
+++ b/src/cert/x509cert/x509cert.h
diff --git a/src/cert/x509/crl_ent.cpp b/src/cert/x509crl/crl_ent.cpp
index 807e99ac9..807e99ac9 100644
--- a/src/cert/x509/crl_ent.cpp
+++ b/src/cert/x509crl/crl_ent.cpp
diff --git a/src/cert/x509/crl_ent.h b/src/cert/x509crl/crl_ent.h
index ec90750db..ec90750db 100644
--- a/src/cert/x509/crl_ent.h
+++ b/src/cert/x509crl/crl_ent.h
diff --git a/src/cert/x509/x509_crl.cpp b/src/cert/x509crl/x509_crl.cpp
index f6a344dba..f6a344dba 100644
--- a/src/cert/x509/x509_crl.cpp
+++ b/src/cert/x509crl/x509_crl.cpp
diff --git a/src/cert/x509/x509_crl.h b/src/cert/x509crl/x509_crl.h
index c2b3c4f5c..c2b3c4f5c 100644
--- a/src/cert/x509/x509_crl.h
+++ b/src/cert/x509crl/x509_crl.h
diff --git a/src/cert/x509/x509opt.cpp b/src/cert/x509self/x509opt.cpp
index 0702ebf19..0702ebf19 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/src/cert/x509self/x509opt.cpp
diff --git a/src/cert/x509/x509self.cpp b/src/cert/x509self/x509self.cpp
index e420ca503..e420ca503 100644
--- a/src/cert/x509/x509self.cpp
+++ b/src/cert/x509self/x509self.cpp
diff --git a/src/cert/x509/x509self.h b/src/cert/x509self/x509self.h
index df5731050..df5731050 100644
--- a/src/cert/x509/x509self.h
+++ b/src/cert/x509self/x509self.h
diff --git a/src/cert/x509/certstor.cpp b/src/cert/x509store/certstor.cpp
index 96f2699df..96f2699df 100644
--- a/src/cert/x509/certstor.cpp
+++ b/src/cert/x509store/certstor.cpp
diff --git a/src/cert/x509/certstor.h b/src/cert/x509store/certstor.h
index 2e39a7178..2e39a7178 100644
--- a/src/cert/x509/certstor.h
+++ b/src/cert/x509store/certstor.h
diff --git a/src/cert/x509/x509find.cpp b/src/cert/x509store/x509find.cpp
index 257367da9..257367da9 100644
--- a/src/cert/x509/x509find.cpp
+++ b/src/cert/x509store/x509find.cpp
diff --git a/src/cert/x509/x509find.h b/src/cert/x509store/x509find.h
index 5624b717b..5624b717b 100644
--- a/src/cert/x509/x509find.h
+++ b/src/cert/x509store/x509find.h
diff --git a/src/cert/x509/x509stor.cpp b/src/cert/x509store/x509stor.cpp
index a24d4a070..a24d4a070 100644
--- a/src/cert/x509/x509stor.cpp
+++ b/src/cert/x509store/x509stor.cpp
diff --git a/src/cert/x509/x509stor.h b/src/cert/x509store/x509stor.h
index 7c3895635..7c3895635 100644
--- a/src/cert/x509/x509stor.h
+++ b/src/cert/x509store/x509stor.h
diff --git a/src/cms/info.txt b/src/cms/info.txt
index b863a9a26..708f1d592 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -12,5 +12,5 @@ pem
 pubkey
 sha1
 sym_algo
-x509
+x509cert
 </requires>
diff --git a/src/ssl/info.txt b/src/ssl/info.txt
index 161b51569..8f1eda497 100644
--- a/src/ssl/info.txt
+++ b/src/ssl/info.txt
@@ -55,5 +55,5 @@ sha1
 ssl3mac
 ssl_prf
 tls_prf
-x509
+x509cert
 </requires>