6 files changed, 9 insertions, 9 deletions
diff --git a/src/cert/pkcs10/pkcs10.cpp b/src/cert/pkcs10/pkcs10.cpp
index d2a7b668d..539022d08 100644
--- a/src/cert/pkcs10/pkcs10.cpp
+++ b/src/cert/pkcs10/pkcs10.cpp
@@ -175,8 +175,8 @@ std::vector<OID> PKCS10_Request::ex_constraints() const
    std::vector<std::string> oids = info.get("X509v3.ExtendedKeyUsage");
 
    std::vector<OID> result;
-   for(u32bit j = 0; j != oids.size(); ++j)
-      result.push_back(OID(oids[j]));
+   for(size_t i = 0; i != oids.size(); ++i)
+      result.push_back(OID(oids[i]));
    return result;
    }
 
diff --git a/src/cms/cms_algo.cpp b/src/cms/cms_algo.cpp
index 33652a6b6..a02f7e737 100644
--- a/src/cms/cms_algo.cpp
+++ b/src/cms/cms_algo.cpp
@@ -39,7 +39,7 @@ SecureVector<byte> do_rfc3217_wrap(RandomNumberGenerator& rng,
             }
          void end_msg()
             {
-            for(u32bit j = 0; j != buf.size(); j++)
+            for(size_t j = 0; j != buf.size(); j++)
                send(buf[buf.size()-j-1]);
             buf.clear();
             }
@@ -149,7 +149,7 @@ SecureVector<byte> CMS_Encoder::encode_params(const std::string& cipher,
 SymmetricKey CMS_Encoder::setup_key(RandomNumberGenerator& rng,
                                     const std::string& cipher)
    {
-   u32bit keysize = 0;
+   size_t keysize = 0;
 
    if(cipher == "TripleDES") keysize = 24;
    if(cipher == "RC2")       keysize = 16;
diff --git a/src/cms/cms_ealg.cpp b/src/cms/cms_ealg.cpp
index 382d5230e..262c74b86 100644
--- a/src/cms/cms_ealg.cpp
+++ b/src/cms/cms_ealg.cpp
@@ -316,7 +316,7 @@ void CMS_Encoder::sign(const X509_Certificate& cert,
    .raw_bytes(make_econtent(data, type));
 
    encoder.start_cons(ASN1_Tag(0), CONTEXT_SPECIFIC);
-   for(u32bit j = 0; j != chain.size(); j++)
+   for(size_t j = 0; j != chain.size(); j++)
       encoder.raw_bytes(chain[j].BER_encode());
    encoder.raw_bytes(cert.BER_encode()).end_cons();
 
diff --git a/src/cms/cms_enc.cpp b/src/cms/cms_enc.cpp
index 3437c15e3..1cc2064ac 100644
--- a/src/cms/cms_enc.cpp
+++ b/src/cms/cms_enc.cpp
@@ -15,7 +15,7 @@ namespace Botan {
 /*
 * Setup the intitial layer of CMS data
 */
-void CMS_Encoder::set_data(const byte buf[], u32bit length)
+void CMS_Encoder::set_data(const byte buf[], size_t length)
    {
    if(!data.empty())
       throw Invalid_State("Cannot call CMS_Encoder::set_data here");
diff --git a/src/cms/cms_enc.h b/src/cms/cms_enc.h
index f8e9a5a8f..5dca838dd 100644
--- a/src/cms/cms_enc.h
+++ b/src/cms/cms_enc.h
@@ -51,10 +51,10 @@ class BOTAN_DLL CMS_Encoder
       std::string PEM_contents();
 
       void set_data(const std::string&);
-      void set_data(const byte[], u32bit);
+      void set_data(const byte[], size_t);
 
       CMS_Encoder(const std::string& str) { set_data(str); }
-      CMS_Encoder(const byte buf[], u32bit length) { set_data(buf, length); }
+      CMS_Encoder(const byte buf[], size_t length) { set_data(buf, length); }
    private:
       void add_layer(const std::string&, DER_Encoder&);
 
diff --git a/src/pubkey/x509_key.cpp b/src/pubkey/x509_key.cpp
index d321ce338..4714b1285 100644
--- a/src/pubkey/x509_key.cpp
+++ b/src/pubkey/x509_key.cpp
@@ -115,7 +115,7 @@ Key_Constraints find_constraints(const Public_Key& pub_key,
    {
    const std::string name = pub_key.algo_name();
 
-   u32bit constraints = 0;
+   size_t constraints = 0;
 
    if(name == "DH" || name == "ECDH")
       constraints |= KEY_AGREEMENT;