propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)

            to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)

3 files changed, 6 insertions, 3 deletions

diff --git a/src/cert/x509/pkcs10.cpp b/src/cert/x509/pkcs10.cpp
index 5645552a0..e78439757 100644
--- a/src/cert/x509/pkcs10.cpp
+++ b/src/cert/x509/pkcs10.cpp
@@ -186,7 +186,7 @@ std::vector<OID> PKCS10_Request::ex_constraints() const
 */
 bool PKCS10_Request::is_CA() const
    {
-   return info.get1_u32bit("X509v3.BasicConstraints.is_ca");
+   return (info.get1_u32bit("X509v3.BasicConstraints.is_ca") > 0);
    }
 
 /*
diff --git a/src/cert/x509/x509_ext.cpp b/src/cert/x509/x509_ext.cpp
index e88b5a268..9a03c9d23 100644
--- a/src/cert/x509/x509_ext.cpp
+++ b/src/cert/x509/x509_ext.cpp
@@ -471,8 +471,10 @@ class Policy_Information : public ASN1_Object
 */
 MemoryVector<byte> Certificate_Policies::encode_inner() const
    {
+   // FIXME
+#if 1
    throw Exception("Certificate_Policies::encode_inner: Bugged");
-
+#else
    std::vector<Policy_Information> policies;
 
    return DER_Encoder()
@@ -480,6 +482,7 @@ MemoryVector<byte> Certificate_Policies::encode_inner() const
          .encode_list(policies)
       .end_cons()
    .get_contents();
+#endif
    }
 
 /*
diff --git a/src/cert/x509/x509opt.cpp b/src/cert/x509/x509opt.cpp
index 8d235ad5d..fda889224 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/src/cert/x509/x509opt.cpp
@@ -78,7 +78,7 @@ void X509_Cert_Options::sanity_check() const
 * Initialize the certificate options
 */
 X509_Cert_Options::X509_Cert_Options(const std::string& initial_opts,
-                                     u32bit expiration_time)
+                                     u32bit expiration_time_in_seconds)
    {
    is_CA = false;
    path_limit = 0;