Convert to using standard uintN_t integer types

Renames a couple of functions for somewhat better name consistency,
eg make_u32bit becomes make_uint32. The old typedefs remain for now
since probably lots of application code uses them.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/block/cast/cast128.h b/src/lib/block/cast/cast128.h
index 2782e96b9..96e543aed 100644
--- a/src/lib/block/cast/cast128.h
+++ b/src/lib/block/cast/cast128.h
@@ -18,21 +18,21 @@ namespace Botan {
 class BOTAN_DLL CAST_128 final : public Block_Cipher_Fixed_Params<8, 11, 16>
    {
    public:
-      void encrypt_n(const byte in[], byte out[], size_t blocks) const override;
-      void decrypt_n(const byte in[], byte out[], size_t blocks) const override;
+      void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override;
+      void decrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override;
 
       void clear() override;
       std::string name() const override { return "CAST-128"; }
       BlockCipher* clone() const override { return new CAST_128; }
 
    private:
-      void key_schedule(const byte[], size_t) override;
+      void key_schedule(const uint8_t[], size_t) override;
 
-      static void cast_ks(secure_vector<u32bit>& ks,
-                          secure_vector<u32bit>& user_key);
+      static void cast_ks(secure_vector<uint32_t>& ks,
+                          secure_vector<uint32_t>& user_key);
 
-      secure_vector<u32bit> m_MK;
-      secure_vector<byte> m_RK;
+      secure_vector<uint32_t> m_MK;
+      secure_vector<uint8_t> m_RK;
    };
 
 }