Convert the BER/DER coders to use size_t instead of u32bit for small

integer values. Update callers.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/cert/x509self/x509opt.cpp b/src/cert/x509self/x509opt.cpp
index 0702ebf19..345df1fe0 100644
--- a/src/cert/x509self/x509opt.cpp
+++ b/src/cert/x509self/x509opt.cpp
@@ -55,7 +55,7 @@ void X509_Cert_Options::add_ex_constraint(const std::string& oid_str)
 /*
 * Mark this certificate for CA usage
 */
-void X509_Cert_Options::CA_key(u32bit limit)
+void X509_Cert_Options::CA_key(size_t limit)
    {
    is_CA = true;
    path_limit = limit;
diff --git a/src/cert/x509self/x509self.cpp b/src/cert/x509self/x509self.cpp
index e420ca503..a2f89159f 100644
--- a/src/cert/x509self/x509self.cpp
+++ b/src/cert/x509self/x509self.cpp
@@ -103,7 +103,7 @@ PKCS10_Request create_cert_req(const X509_Cert_Options& opts,
    std::auto_ptr<PK_Signer> signer(choose_sig_format(key, hash_fn, sig_algo));
    load_info(opts, subject_dn, subject_alt);
 
-   const u32bit PKCS10_VERSION = 0;
+   const size_t PKCS10_VERSION = 0;
 
    Extensions extensions;
 
diff --git a/src/cert/x509self/x509self.h b/src/cert/x509self/x509self.h
index df5731050..2850096c8 100644
--- a/src/cert/x509self/x509self.h
+++ b/src/cert/x509self/x509self.h
@@ -102,7 +102,7 @@ class BOTAN_DLL X509_Cert_Options
       /**
       * Indicates the BasicConstraints path limit
       */
-      u32bit path_limit;
+      size_t path_limit;
 
       /**
       * The key constraints for the subject public key
@@ -123,7 +123,7 @@ class BOTAN_DLL X509_Cert_Options
       * Mark the certificate as a CA certificate and set the path limit.
       * @param limit the path limit to be set in the BasicConstraints extension.
       */
-      void CA_key(u32bit limit = 1);
+      void CA_key(size_t limit = 1);
 
       /**
       * Set the notBefore of the certificate.