Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

handshake: Allow adding of ECC SAE-PT points

Browse Source
This commit is contained in:
Denis Kenzior 2021-07-08 14:10:15 -05:00
parent ead1f0e96e
commit de04e6d723
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/handshake.c
View File

@ -42,6 +42,29 @@
#include "src/util.h"
#include "src/handshake.h"
static inline unsigned int n_ecc_groups()
{
const unsigned int *groups = l_ecc_supported_ike_groups();
unsigned int j = 0;
while (groups[j])
j += 1;
return j;
}
static inline int ecc_group_index(unsigned int group)
{
const unsigned int *groups = l_ecc_supported_ike_groups();
int j;
for (j = 0; groups[j]; j++)
if (groups[j] == group)
return j;
return -ENOENT;
}
static bool handshake_get_nonce(uint8_t nonce[])
{
return l_getrandom(nonce, 32);
@ -86,6 +109,15 @@ void handshake_state_free(struct handshake_state *s)
l_free(s->passphrase);
}
if (s->ecc_sae_pts) {
unsigned int i;
for (i = 0; i < n_ecc_groups(); i++)
l_ecc_point_free(s->ecc_sae_pts[i]);
l_free(s->ecc_sae_pts);
}
explicit_bzero(s, sizeof(*s));
if (destroy)
@ -921,3 +953,28 @@ bool handshake_decode_fte_key(struct handshake_state *s, const uint8_t *wrapped,
return true;
}
/* Add SAE-PT for ECC groups. The group is carried by the point itself */
bool handshake_state_add_ecc_sae_pt(struct handshake_state *s,
const struct l_ecc_point *pt)
{
const struct l_ecc_curve *curve;
int i;
if (!pt)
return false;
curve = l_ecc_point_get_curve(pt);
if (!s->ecc_sae_pts)
s->ecc_sae_pts = l_new(struct l_ecc_point *, n_ecc_groups());
if ((i = ecc_group_index(l_ecc_curve_get_ike_group(curve))) < 0)
return false;
if (s->ecc_sae_pts[i])
return false;
s->ecc_sae_pts[i] = l_ecc_point_clone(pt);
return true;
}

3
src/handshake.h
View File

@ -104,6 +104,7 @@ struct handshake_state {
uint8_t fils_ft[48];
uint8_t fils_ft_len;
struct l_settings *settings_8021x;
struct l_ecc_point **ecc_sae_pts;
bool have_snonce : 1;
bool ptk_complete : 1;
bool wpa_ie : 1;
@ -178,6 +179,8 @@ void handshake_state_set_event_func(struct handshake_state *s,
void *user_data);
void handshake_state_set_passphrase(struct handshake_state *s,
const char *passphrase);
bool handshake_state_add_ecc_sae_pt(struct handshake_state *s,
const struct l_ecc_point *pt);
void handshake_state_set_no_rekey(struct handshake_state *s, bool no_rekey);
void handshake_state_set_fils_ft(struct handshake_state *s,