propagate from branch 'net.randombit.botan' (head dd068808e5bf87c982765a8bcc314996053a5bdd)

            to branch 'net.randombit.botan.c++0x' (head 34696d52a8148d64f7021b3e193fc56f051b9dd2)

3 files changed, 11 insertions, 9 deletions

diff --git a/src/cert/certstore/info.txt b/src/cert/certstore/info.txt
index ee730490f..a5de1baff 100644
--- a/src/cert/certstore/info.txt
+++ b/src/cert/certstore/info.txt
@@ -1,5 +1,6 @@
 define CERTIFICATE_STORE
 
 <requires>
-asn1
+x509cert
+x509crl
 </requires>
diff --git a/src/cert/x509cert/info.txt b/src/cert/x509cert/info.txt
index 3be50f077..5e3715e7a 100644
--- a/src/cert/x509cert/info.txt
+++ b/src/cert/x509cert/info.txt
@@ -2,4 +2,5 @@ define X509_CERTIFICATES
 
 <requires>
 certstore
+datastor
 </requires>
diff --git a/src/cert/x509cert/x509cert.cpp b/src/cert/x509cert/x509cert.cpp
index a431cb66d..40b61b47d 100644
--- a/src/cert/x509cert/x509cert.cpp
+++ b/src/cert/x509cert/x509cert.cpp
@@ -325,8 +325,8 @@ std::string X509_Certificate::to_string() const
          continue;
 
       out << "Subject " << dn_fields[i] << ":";
-      for(size_t i = 0; i != vals.size(); ++i)
-         out << " " << vals[i];
+      for(size_t j = 0; j != vals.size(); ++j)
+         out << " " << vals[j];
       out << "\n";
       }
 
@@ -338,8 +338,8 @@ std::string X509_Certificate::to_string() const
          continue;
 
       out << "Issuer " << dn_fields[i] << ":";
-      for(size_t i = 0; i != vals.size(); ++i)
-         out << " " << vals[i];
+      for(size_t j = 0; j != vals.size(); ++j)
+         out << " " << vals[j];
       out << "\n";
       }
 
@@ -374,16 +374,16 @@ std::string X509_Certificate::to_string() const
    if(policies.size())
       {
       out << "Policies: " << "\n";
-      for(u32bit j = 0; j != policies.size(); j++)
-         out << "   " << policies[j] << "\n";
+      for(size_t i = 0; i != policies.size(); i++)
+         out << "   " << policies[i] << "\n";
       }
 
    std::vector<std::string> ex_constraints = this->ex_constraints();
    if(ex_constraints.size())
       {
       out << "Extended Constraints:\n";
-      for(u32bit j = 0; j != ex_constraints.size(); j++)
-         out << "   " << ex_constraints[j] << "\n";
+      for(size_t i = 0; i != ex_constraints.size(); i++)
+         out << "   " << ex_constraints[i] << "\n";
       }
 
    out << "Signature algorithm: " <<