aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_version.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/tls/tls_version.h
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
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.
Diffstat (limited to 'src/lib/tls/tls_version.h')
-rw-r--r--src/lib/tls/tls_version.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/tls/tls_version.h b/src/lib/tls/tls_version.h
index 29839502d..f60297e8a 100644
--- a/src/lib/tls/tls_version.h
+++ b/src/lib/tls/tls_version.h
@@ -52,14 +52,14 @@ class BOTAN_DLL Protocol_Version
* @param named_version a specific named version of the protocol
*/
Protocol_Version(Version_Code named_version) :
- m_version(static_cast<u16bit>(named_version)) {}
+ m_version(static_cast<uint16_t>(named_version)) {}
/**
* @param major the major version
* @param minor the minor version
*/
- Protocol_Version(byte major, byte minor) :
- m_version((static_cast<u16bit>(major) << 8) | minor) {}
+ Protocol_Version(uint8_t major, uint8_t minor) :
+ m_version((static_cast<uint16_t>(major) << 8) | minor) {}
/**
* @return true if this is a valid protocol version
@@ -74,12 +74,12 @@ class BOTAN_DLL Protocol_Version
/**
* @return major version of the protocol version
*/
- byte major_version() const { return get_byte(0, m_version); }
+ uint8_t major_version() const { return get_byte(0, m_version); }
/**
* @return minor version of the protocol version
*/
- byte minor_version() const { return get_byte(1, m_version); }
+ uint8_t minor_version() const { return get_byte(1, m_version); }
/**
* @return human-readable description of this version
@@ -138,7 +138,7 @@ class BOTAN_DLL Protocol_Version
}
private:
- u16bit m_version;
+ uint16_t m_version;
};
}