aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-03-31 12:52:40 (GMT)
committerJouni Malinen <j@w1.fi>2015-03-31 12:52:40 (GMT)
commit94f1fe6f6384a2ef379ef5b8cdc32a2fa01f8d13 (patch)
tree710625484d899a00d2ff9c1ce2515180bc83e818 /src/tls
parentfa0e715100b0e6fd956b6de67c3cdf908437436a (diff)
downloadhostap-94f1fe6f6384a2ef379ef5b8cdc32a2fa01f8d13.zip
hostap-94f1fe6f6384a2ef379ef5b8cdc32a2fa01f8d13.tar.gz
hostap-94f1fe6f6384a2ef379ef5b8cdc32a2fa01f8d13.tar.bz2
Remove master key extraction from tls_connection_get_keys()
This is not needed anymore with the tls_connection_prf() being used to handle all key derivation needs. tls_connection_get_keys() is a bit misnamed for now, but it is only used to fetch the client and server random for Session-Id derivation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'src/tls')
-rw-r--r--src/tls/tlsv1_client.c2
-rw-r--r--src/tls/tlsv1_server.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/tls/tlsv1_client.c b/src/tls/tlsv1_client.c
index facdd65..533286c 100644
--- a/src/tls/tlsv1_client.c
+++ b/src/tls/tlsv1_client.c
@@ -731,8 +731,6 @@ int tlsv1_client_get_keys(struct tlsv1_client *conn, struct tls_keys *keys)
if (conn->state != SERVER_HELLO) {
keys->server_random = conn->server_random;
keys->server_random_len = TLS_RANDOM_LEN;
- keys->master_key = conn->master_secret;
- keys->master_key_len = TLS_MASTER_SECRET_LEN;
}
return 0;
diff --git a/src/tls/tlsv1_server.c b/src/tls/tlsv1_server.c
index 93ae488..4df756f 100644
--- a/src/tls/tlsv1_server.c
+++ b/src/tls/tlsv1_server.c
@@ -627,8 +627,6 @@ int tlsv1_server_get_keys(struct tlsv1_server *conn, struct tls_keys *keys)
if (conn->state != SERVER_HELLO) {
keys->server_random = conn->server_random;
keys->server_random_len = TLS_RANDOM_LEN;
- keys->master_key = conn->master_secret;
- keys->master_key_len = TLS_MASTER_SECRET_LEN;
}
return 0;