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/pubkey/xmss/xmss_address.h b/src/lib/pubkey/xmss/xmss_address.h
index 07bfd1dbf..4ad30c3d9 100644
--- a/src/lib/pubkey/xmss/xmss_address.h
+++ b/src/lib/pubkey/xmss/xmss_address.h
@@ -112,7 +112,7 @@ class XMSS_Address
        **/
       void set_type(Type type)
          {
-         m_data[15] = static_cast<byte>(type);
+         m_data[15] = static_cast<uint8_t>(type);
          std::fill(m_data.begin() + 16, m_data.end(), 0);
          }
 
@@ -138,7 +138,7 @@ class XMSS_Address
          BOTAN_ASSERT(value != Key_Mask::Mask_LSB_Mode ||
                       get_type() != Type::OTS_Hash_Address,
                       "Invalid Key_Mask for current XMSS_Address::Type.");
-         m_data[31] = static_cast<byte>(value);
+         m_data[31] = static_cast<uint8_t>(value);
          }
 
       /**
@@ -323,12 +323,12 @@ class XMSS_Address
          set_hi32(3, value);
          }
 
-      const secure_vector<byte>& bytes() const
+      const secure_vector<uint8_t>& bytes() const
          {
          return m_data;
          }
 
-      secure_vector<byte>& bytes()
+      secure_vector<uint8_t>& bytes()
          {
          return m_data;
          }
@@ -353,20 +353,20 @@ class XMSS_Address
          set_type(type);
          }
 
-      XMSS_Address(const secure_vector<byte>& data) : m_data(data)
+      XMSS_Address(const secure_vector<uint8_t>& data) : m_data(data)
          {
          BOTAN_ASSERT(m_data.size() == m_address_size,
                       "XMSS_Address must be of 256 bits size.");
          }
 
-      XMSS_Address(secure_vector<byte>&& data) : m_data(std::move(data))
+      XMSS_Address(secure_vector<uint8_t>&& data) : m_data(std::move(data))
          {
          BOTAN_ASSERT(m_data.size() == m_address_size,
                       "XMSS_Address must be of 256 bits size.");
          }
 
    protected:
-      secure_vector<byte> m_data;
+      secure_vector<uint8_t> m_data;
 
    private:
       static const size_t m_address_size = 32;