Merge GH #771 Use cstdint integer types

1 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index 711d9e30c..ea6ad8234 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -30,9 +30,9 @@ class BOTAN_DLL SIV_Mode : public AEAD_Mode
       * @param ad associated data
       * @param ad_len length of associated data in bytes
       */
-      void set_associated_data_n(size_t n, const byte ad[], size_t ad_len);
+      void set_associated_data_n(size_t n, const uint8_t ad[], size_t ad_len);
 
-      void set_associated_data(const byte ad[], size_t ad_len) override
+      void set_associated_data(const uint8_t ad[], size_t ad_len) override
          {
          set_associated_data_n(0, ad, ad_len);
          }
@@ -56,21 +56,21 @@ class BOTAN_DLL SIV_Mode : public AEAD_Mode
 
       StreamCipher& ctr() { return *m_ctr; }
 
-      void set_ctr_iv(secure_vector<byte> V);
+      void set_ctr_iv(secure_vector<uint8_t> V);
 
-      secure_vector<byte>& msg_buf() { return m_msg_buf; }
+      secure_vector<uint8_t>& msg_buf() { return m_msg_buf; }
 
-      secure_vector<byte> S2V(const byte text[], size_t text_len);
+      secure_vector<uint8_t> S2V(const uint8_t text[], size_t text_len);
    private:
-      void start_msg(const byte nonce[], size_t nonce_len) override;
+      void start_msg(const uint8_t nonce[], size_t nonce_len) override;
 
-      void key_schedule(const byte key[], size_t length) override;
+      void key_schedule(const uint8_t key[], size_t length) override;
 
       const std::string m_name;
       std::unique_ptr<StreamCipher> m_ctr;
       std::unique_ptr<MessageAuthenticationCode> m_cmac;
-      secure_vector<byte> m_nonce, m_msg_buf;
-      std::vector<secure_vector<byte>> m_ad_macs;
+      secure_vector<uint8_t> m_nonce, m_msg_buf;
+      std::vector<secure_vector<uint8_t>> m_ad_macs;
    };
 
 /**
@@ -84,7 +84,7 @@ class BOTAN_DLL SIV_Encryption final : public SIV_Mode
       */
       explicit SIV_Encryption(BlockCipher* cipher) : SIV_Mode(cipher) {}
 
-      void finish(secure_vector<byte>& final_block, size_t offset = 0) override;
+      void finish(secure_vector<uint8_t>& final_block, size_t offset = 0) override;
 
       size_t output_length(size_t input_length) const override
          { return input_length + tag_size(); }
@@ -103,7 +103,7 @@ class BOTAN_DLL SIV_Decryption final : public SIV_Mode
       */
       explicit SIV_Decryption(BlockCipher* cipher) : SIV_Mode(cipher) {}
 
-      void finish(secure_vector<byte>& final_block, size_t offset = 0) override;
+      void finish(secure_vector<uint8_t>& final_block, size_t offset = 0) override;
 
       size_t output_length(size_t input_length) const override
          {