New branch for splitting up path validation vs certificate storage

4 files changed, 7 insertions, 5 deletions

diff --git a/src/cert/x509store/info.txt b/src/cert/x509path/info.txt
index b24b03a02..b24b03a02 100644
--- a/src/cert/x509store/info.txt
+++ b/src/cert/x509path/info.txt
diff --git a/src/cert/x509store/x509stor.cpp b/src/cert/x509path/x509path.cpp
index 3fe1adf62..f3fd091cb 100644
--- a/src/cert/x509store/x509stor.cpp
+++ b/src/cert/x509path/x509path.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/x509stor.h>
+#include <botan/x509path.h>
 #include <botan/parsing.h>
 #include <botan/pubkey.h>
 #include <botan/oids.h>
diff --git a/src/cert/x509store/x509stor.h b/src/cert/x509path/x509path.h
index b4b50022c..60680d0a3 100644
--- a/src/cert/x509store/x509stor.h
+++ b/src/cert/x509path/x509path.h
@@ -1,12 +1,12 @@
 /*
-* X.509 Certificate Store
-* (C) 1999-2007 Jack Lloyd
+* X.509 Cert Path Validation
+* (C) 2010 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_X509_CERT_STORE_H__
-#define BOTAN_X509_CERT_STORE_H__
+#ifndef BOTAN_X509_CERT_PATH_VALIDATION_H__
+#define BOTAN_X509_CERT_PATH_VALIDATION_H__
 
 #include <botan/x509cert.h>
 #include <botan/x509_crl.h>
diff --git a/src/cms/info.txt b/src/cms/info.txt
index dc2110ae5..79c16e200 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -1,5 +1,7 @@
 define CMS
 
+load_on never
+
 <requires>
 asn1
 bigint