aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_session_key.cpp
diff options
context:
space:
mode:
authorKai Michaelis <[email protected]>2016-04-28 15:52:41 +0200
committerKai Michaelis <[email protected]>2016-05-19 15:48:09 +0200
commit55cd86e31f94ed330c0c7a53a577750a92a2b533 (patch)
treec761b939e585471ca7d340271697edafa0fc1a11 /src/lib/tls/tls_session_key.cpp
parent8578e0fc758b81d176d0c5092417f4cc77676895 (diff)
add label parameter to KDF::derive_key
Diffstat (limited to 'src/lib/tls/tls_session_key.cpp')
-rw-r--r--src/lib/tls/tls_session_key.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/tls/tls_session_key.cpp b/src/lib/tls/tls_session_key.cpp
index 0e796aa23..7890813c3 100644
--- a/src/lib/tls/tls_session_key.cpp
+++ b/src/lib/tls/tls_session_key.cpp
@@ -61,7 +61,7 @@ Session_Keys::Session_Keys(const Handshake_State* state,
salt += state->server_hello()->random();
}
- m_master_sec = prf->derive_key(48, pre_master_secret, salt);
+ m_master_sec = prf->derive_key(48, pre_master_secret, salt, secure_vector<byte>());
}
secure_vector<byte> salt;
@@ -69,7 +69,7 @@ Session_Keys::Session_Keys(const Handshake_State* state,
salt += state->server_hello()->random();
salt += state->client_hello()->random();
- SymmetricKey keyblock = prf->derive_key(prf_gen, m_master_sec, salt);
+ SymmetricKey keyblock = prf->derive_key(prf_gen, m_master_sec, salt, secure_vector<byte>());
const byte* key_data = keyblock.begin();