Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-24 06:52:37 +01:00
Code Releases Activity

build: Use l_tls_prf_get_bytes instead of tls_prf_get_bytes

Browse Source
This commit is contained in:
Marcel Holtmann 2018-10-19 08:46:57 +02:00
parent b27edce298
commit 467d3958b4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eap-peap.c
View File

@ -518,7 +518,7 @@ static void eap_peap_tunnel_ready(const char *peer_identity, void *user_data)
memcpy(random + 0, peap->tunnel->pending.client_random, 32); memcpy(random + 0, peap->tunnel->pending.client_random, 32);
memcpy(random + 32, peap->tunnel->pending.server_random, 32); memcpy(random + 32, peap->tunnel->pending.server_random, 32);
tls_prf_get_bytes(peap->tunnel, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(peap->tunnel, L_CHECKSUM_SHA256, 32,
peap->tunnel->pending.master_secret, peap->tunnel->pending.master_secret,
sizeof(peap->tunnel->pending.master_secret), sizeof(peap->tunnel->pending.master_secret),
"client EAP encryption", random, 64, "client EAP encryption", random, 64,

4
src/eap-tls.c
View File

@ -150,12 +150,12 @@ static void eap_tls_ready_cb(const char *peer_identity, void *user_data)
memcpy(seed + 0, tls->tls->pending.client_random, 32); memcpy(seed + 0, tls->tls->pending.client_random, 32);
memcpy(seed + 32, tls->tls->pending.server_random, 32); memcpy(seed + 32, tls->tls->pending.server_random, 32);
tls_prf_get_bytes(tls->tls, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(tls->tls, L_CHECKSUM_SHA256, 32,
tls->tls->pending.master_secret, tls->tls->pending.master_secret,
sizeof(tls->tls->pending.master_secret), sizeof(tls->tls->pending.master_secret),
"client EAP encryption", seed, 64, "client EAP encryption", seed, 64,
msk_emsk, 128); msk_emsk, 128);
tls_prf_get_bytes(tls->tls, L_CHECKSUM_SHA256, 32, NULL, 0, l_tls_prf_get_bytes(tls->tls, L_CHECKSUM_SHA256, 32, NULL, 0,
"client EAP encryption", seed, 64, "client EAP encryption", seed, 64,
iv, 64); iv, 64);

4
src/eap-ttls.c
View File

@ -460,7 +460,7 @@ static void eap_ttls_phase2_chap_generate_challenge(struct l_tls *tunnel,
memcpy(seed + 0, tunnel->pending.client_random, 32); memcpy(seed + 0, tunnel->pending.client_random, 32);
memcpy(seed + 32, tunnel->pending.server_random, 32); memcpy(seed + 32, tunnel->pending.server_random, 32);
tls_prf_get_bytes(tunnel, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(tunnel, L_CHECKSUM_SHA256, 32,
tunnel->pending.master_secret, tunnel->pending.master_secret,
sizeof(tunnel->pending.master_secret), sizeof(tunnel->pending.master_secret),
"ttls challenge", seed, 64, "ttls challenge", seed, 64,
@ -713,7 +713,7 @@ static void eap_ttls_ready_cb(const char *peer_identity, void *user_data)
memcpy(seed + 0, ttls->tls->pending.client_random, 32); memcpy(seed + 0, ttls->tls->pending.client_random, 32);
memcpy(seed + 32, ttls->tls->pending.server_random, 32); memcpy(seed + 32, ttls->tls->pending.server_random, 32);
tls_prf_get_bytes(ttls->tls, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(ttls->tls, L_CHECKSUM_SHA256, 32,
ttls->tls->pending.master_secret, ttls->tls->pending.master_secret,
sizeof(ttls->tls->pending.master_secret), sizeof(ttls->tls->pending.master_secret),
"ttls keying material", seed, 64, "ttls keying material", seed, 64,

4
unit/test-eapol.c
View File

@ -2850,7 +2850,7 @@ static void eapol_sm_test_tls_test_ready(const char *peer_identity,
memcpy(seed + 0, s->tls->pending.client_random, 32); memcpy(seed + 0, s->tls->pending.client_random, 32);
memcpy(seed + 32, s->tls->pending.server_random, 32); memcpy(seed + 32, s->tls->pending.server_random, 32);
tls_prf_get_bytes(s->tls, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(s->tls, L_CHECKSUM_SHA256, 32,
s->tls->pending.master_secret, s->tls->pending.master_secret,
sizeof(s->tls->pending.master_secret), sizeof(s->tls->pending.master_secret),
"client EAP encryption", seed, 64, s->pmk, 32); "client EAP encryption", seed, 64, s->pmk, 32);
@ -3172,7 +3172,7 @@ static void eapol_sm_test_eap_ttls_test_ready(const char *peer_identity,
memcpy(seed + 0, s->tls.tls->pending.client_random, 32); memcpy(seed + 0, s->tls.tls->pending.client_random, 32);
memcpy(seed + 32, s->tls.tls->pending.server_random, 32); memcpy(seed + 32, s->tls.tls->pending.server_random, 32);
tls_prf_get_bytes(s->tls.tls, L_CHECKSUM_SHA256, 32, l_tls_prf_get_bytes(s->tls.tls, L_CHECKSUM_SHA256, 32,
s->tls.tls->pending.master_secret, s->tls.tls->pending.master_secret,
sizeof(s->tls.tls->pending.master_secret), sizeof(s->tls.tls->pending.master_secret),
"ttls keying material", seed, 64, "ttls keying material", seed, 64,