diff options
author | Andrej Shadura <andrewsh@debian.org> | 2018-05-07 19:18:59 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2018-05-07 19:18:59 +0200 |
commit | 1c66e25ec3baa25f8fe09f3f240b620a004e7026 (patch) | |
tree | 61b44f30cc85673e26ba789d75a2dfe267bd0ba0 /src/common/sae.c | |
parent | 1e2b7568b4f69a9da79de660a1a04ef077479628 (diff) |
New upstream version 2.7~git20180504+60a5737
Diffstat (limited to 'src/common/sae.c')
-rw-r--r-- | src/common/sae.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/common/sae.c b/src/common/sae.c index 9f70f03..fa28dfb 100644 --- a/src/common/sae.c +++ b/src/common/sae.c @@ -29,6 +29,8 @@ int sae_set_group(struct sae_data *sae, int group) /* First, check if this is an ECC group */ tmp->ec = crypto_ec_init(group); if (tmp->ec) { + wpa_printf(MSG_DEBUG, "SAE: Selecting supported ECC group %d", + group); sae->group = group; tmp->prime_len = crypto_ec_prime_len(tmp->ec); tmp->prime = crypto_ec_get_prime(tmp->ec); @@ -39,6 +41,8 @@ int sae_set_group(struct sae_data *sae, int group) /* Not an ECC group, check FFC */ tmp->dh = dh_groups_get(group); if (tmp->dh) { + wpa_printf(MSG_DEBUG, "SAE: Selecting supported FFC group %d", + group); sae->group = group; tmp->prime_len = tmp->dh->prime_len; if (tmp->prime_len > SAE_MAX_PRIME_LEN) { @@ -66,6 +70,8 @@ int sae_set_group(struct sae_data *sae, int group) } /* Unsupported group */ + wpa_printf(MSG_DEBUG, + "SAE: Group %d not supported by the crypto library", group); return -1; } @@ -1235,7 +1241,8 @@ void sae_write_confirm(struct sae_data *sae, struct wpabuf *buf) /* Send-Confirm */ sc = wpabuf_put(buf, 0); wpabuf_put_le16(buf, sae->send_confirm); - sae->send_confirm++; + if (sae->send_confirm < 0xffff) + sae->send_confirm++; if (sae->tmp->ec) sae_cn_confirm_ecc(sae, sc, sae->tmp->own_commit_scalar, @@ -1292,3 +1299,19 @@ int sae_check_confirm(struct sae_data *sae, const u8 *data, size_t len) return 0; } + + +const char * sae_state_txt(enum sae_state state) +{ + switch (state) { + case SAE_NOTHING: + return "Nothing"; + case SAE_COMMITTED: + return "Committed"; + case SAE_CONFIRMED: + return "Confirmed"; + case SAE_ACCEPTED: + return "Accepted"; + } + return "?"; +} |