aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_handshake_state.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_handshake_state.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_handshake_state.h')
-rw-r--r--src/lib/tls/tls_handshake_state.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/tls/tls_handshake_state.h b/src/lib/tls/tls_handshake_state.h
index bdfc0d5d5..889f0d101 100644
--- a/src/lib/tls/tls_handshake_state.h
+++ b/src/lib/tls/tls_handshake_state.h
@@ -74,10 +74,10 @@ class Handshake_State
*/
void set_expected_next(Handshake_Type msg_type);
- std::pair<Handshake_Type, std::vector<byte>>
+ std::pair<Handshake_Type, std::vector<uint8_t>>
get_next_handshake_msg();
- std::vector<byte> session_ticket() const;
+ std::vector<uint8_t> session_ticket() const;
std::pair<std::string, Signature_Format>
parse_sig_format(const Public_Key& key,
@@ -162,7 +162,7 @@ class Handshake_State
void compute_session_keys();
- void compute_session_keys(const secure_vector<byte>& resume_master_secret);
+ void compute_session_keys(const secure_vector<uint8_t>& resume_master_secret);
Handshake_Hash& hash() { return m_handshake_hash; }
@@ -175,8 +175,8 @@ class Handshake_State
std::unique_ptr<Handshake_IO> m_handshake_io;
- u32bit m_hand_expecting_mask = 0;
- u32bit m_hand_received_mask = 0;
+ uint32_t m_hand_expecting_mask = 0;
+ uint32_t m_hand_received_mask = 0;
Protocol_Version m_version;
Ciphersuite m_ciphersuite;
Session_Keys m_session_keys;