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, 8 insertions, 8 deletions

diff --git a/src/lib/stream/chacha/chacha.h b/src/lib/stream/chacha/chacha.h
index 6b1c989e2..876b9ca33 100644
--- a/src/lib/stream/chacha/chacha.h
+++ b/src/lib/stream/chacha/chacha.h
@@ -29,9 +29,9 @@ class BOTAN_DLL ChaCha final : public StreamCipher
 
       std::string provider() const override;
 
-      void cipher(const byte in[], byte out[], size_t length) override;
+      void cipher(const uint8_t in[], uint8_t out[], size_t length) override;
 
-      void set_iv(const byte iv[], size_t iv_len) override;
+      void set_iv(const uint8_t iv[], size_t iv_len) override;
 
       bool valid_iv_length(size_t iv_len) const override
          { return (iv_len == 8 || iv_len == 12); }
@@ -45,20 +45,20 @@ class BOTAN_DLL ChaCha final : public StreamCipher
 
       std::string name() const override;
 
-      void seek(u64bit offset) override;
+      void seek(uint64_t offset) override;
 
    private:
-      void key_schedule(const byte key[], size_t key_len) override;
+      void key_schedule(const uint8_t key[], size_t key_len) override;
 
-      void chacha_x4(byte output[64*4], u32bit state[16], size_t rounds);
+      void chacha_x4(uint8_t output[64*4], uint32_t state[16], size_t rounds);
 
 #if defined(BOTAN_HAS_CHACHA_SSE2)
-      void chacha_sse2_x4(byte output[64*4], u32bit state[16], size_t rounds);
+      void chacha_sse2_x4(uint8_t output[64*4], uint32_t state[16], size_t rounds);
 #endif
 
       size_t m_rounds;
-      secure_vector<u32bit> m_state;
-      secure_vector<byte> m_buffer;
+      secure_vector<uint32_t> m_state;
+      secure_vector<uint8_t> m_buffer;
       size_t m_position = 0;
    };