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

diff --git a/src/lib/stream/salsa20/salsa20.h b/src/lib/stream/salsa20/salsa20.h
index a128c5a98..935f5cf85 100644
--- a/src/lib/stream/salsa20/salsa20.h
+++ b/src/lib/stream/salsa20/salsa20.h
@@ -18,9 +18,9 @@ namespace Botan {
 class BOTAN_DLL Salsa20 final : public StreamCipher
    {
    public:
-      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 == 0 || iv_len == 8 || iv_len == 24); }
@@ -34,12 +34,12 @@ class BOTAN_DLL Salsa20 final : public StreamCipher
       std::string name() const override;
       StreamCipher* clone() const override { return new Salsa20; }
 
-      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;
 
-      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;
    };