int sae_set_group(struct sae_data *sae, int group)
{
+ struct sae_temporary_data *tmp;
+
sae_clear_data(sae);
+ tmp = sae->tmp = os_zalloc(sizeof(*tmp));
+ if (tmp == NULL)
+ return -1;
/* First, check if this is an ECC group */
- sae->ec = crypto_ec_init(group);
- if (sae->ec) {
+ tmp->ec = crypto_ec_init(group);
+ if (tmp->ec) {
sae->group = group;
- sae->prime_len = crypto_ec_prime_len(sae->ec);
- sae->prime = crypto_ec_get_prime(sae->ec);
- sae->order = crypto_ec_get_order(sae->ec);
+ tmp->prime_len = crypto_ec_prime_len(tmp->ec);
+ tmp->prime = crypto_ec_get_prime(tmp->ec);
+ tmp->order = crypto_ec_get_order(tmp->ec);
return 0;
}
/* Not an ECC group, check FFC */
- sae->dh = dh_groups_get(group);
- if (sae->dh) {
+ tmp->dh = dh_groups_get(group);
+ if (tmp->dh) {
sae->group = group;
- sae->prime_len = sae->dh->prime_len;
- if (sae->prime_len > SAE_MAX_PRIME_LEN) {
+ tmp->prime_len = tmp->dh->prime_len;
+ if (tmp->prime_len > SAE_MAX_PRIME_LEN) {
sae_clear_data(sae);
return -1;
}
- sae->prime_buf = crypto_bignum_init_set(sae->dh->prime,
- sae->prime_len);
- if (sae->prime_buf == NULL) {
+ tmp->prime_buf = crypto_bignum_init_set(tmp->dh->prime,
+ tmp->prime_len);
+ if (tmp->prime_buf == NULL) {
sae_clear_data(sae);
return -1;
}
- sae->prime = sae->prime_buf;
+ tmp->prime = tmp->prime_buf;
- sae->order_buf = crypto_bignum_init_set(sae->dh->order,
- sae->dh->order_len);
- if (sae->order_buf == NULL) {
+ tmp->order_buf = crypto_bignum_init_set(tmp->dh->order,
+ tmp->dh->order_len);
+ if (tmp->order_buf == NULL) {
sae_clear_data(sae);
return -1;
}
- sae->order = sae->order_buf;
+ tmp->order = tmp->order_buf;
return 0;
}
}
-void sae_clear_data(struct sae_data *sae)
+void sae_clear_temp_data(struct sae_data *sae)
{
- if (sae == NULL)
+ struct sae_temporary_data *tmp;
+ if (sae == NULL || sae->tmp == NULL)
return;
- crypto_ec_deinit(sae->ec);
- crypto_bignum_deinit(sae->prime_buf, 0);
- crypto_bignum_deinit(sae->order_buf, 0);
- crypto_bignum_deinit(sae->sae_rand, 1);
- crypto_bignum_deinit(sae->pwe_ffc, 1);
- crypto_bignum_deinit(sae->own_commit_scalar, 0);
- crypto_bignum_deinit(sae->peer_commit_scalar, 0);
- crypto_bignum_deinit(sae->own_commit_element_ffc, 0);
- crypto_bignum_deinit(sae->peer_commit_element_ffc, 0);
- crypto_ec_point_deinit(sae->pwe_ecc, 1);
- crypto_ec_point_deinit(sae->own_commit_element_ecc, 0);
- crypto_ec_point_deinit(sae->peer_commit_element_ecc, 0);
- os_memset(sae, 0, sizeof(*sae));
-}
-
-
-static int val_one(const u8 *val, size_t len)
-{
- size_t i;
-
- for (i = 0; i < len - 1; i++) {
- if (val[i])
- return 0;
- }
-
- return val[len - 1] == 1;
+ tmp = sae->tmp;
+ crypto_ec_deinit(tmp->ec);
+ crypto_bignum_deinit(tmp->prime_buf, 0);
+ crypto_bignum_deinit(tmp->order_buf, 0);
+ crypto_bignum_deinit(tmp->sae_rand, 1);
+ crypto_bignum_deinit(tmp->pwe_ffc, 1);
+ crypto_bignum_deinit(tmp->own_commit_scalar, 0);
+ crypto_bignum_deinit(tmp->own_commit_element_ffc, 0);
+ crypto_bignum_deinit(tmp->peer_commit_element_ffc, 0);
+ crypto_ec_point_deinit(tmp->pwe_ecc, 1);
+ crypto_ec_point_deinit(tmp->own_commit_element_ecc, 0);
+ crypto_ec_point_deinit(tmp->peer_commit_element_ecc, 0);
+ wpabuf_free(tmp->anti_clogging_token);
+ os_free(sae->tmp);
+ sae->tmp = NULL;
}
-static int val_zero_or_one(const u8 *val, size_t len)
+void sae_clear_data(struct sae_data *sae)
{
- size_t i;
-
- for (i = 0; i < len - 1; i++) {
- if (val[i])
- return 0;
- }
-
- return val[len - 1] <= 1;
+ if (sae == NULL)
+ return;
+ sae_clear_temp_data(sae);
+ crypto_bignum_deinit(sae->peer_commit_scalar, 0);
+ os_memset(sae, 0, sizeof(*sae));
}
u8 val[SAE_MAX_PRIME_LEN];
int iter = 0;
struct crypto_bignum *bn = NULL;
- int order_len_bits = crypto_bignum_bits(sae->order);
+ int order_len_bits = crypto_bignum_bits(sae->tmp->order);
size_t order_len = (order_len_bits + 7) / 8;
if (order_len > sizeof(val))
return NULL;
if (order_len_bits % 8)
buf_shift_right(val, order_len, 8 - order_len_bits % 8);
- if (val_zero_or_one(val, order_len))
- continue;
bn = crypto_bignum_init_set(val, order_len);
if (bn == NULL)
return NULL;
- if (crypto_bignum_cmp(bn, sae->order) >= 0)
+ if (crypto_bignum_is_zero(bn) ||
+ crypto_bignum_is_one(bn) ||
+ crypto_bignum_cmp(bn, sae->tmp->order) >= 0) {
+ crypto_bignum_deinit(bn, 0);
continue;
+ }
break;
}
static struct crypto_bignum * sae_get_rand_and_mask(struct sae_data *sae)
{
- crypto_bignum_deinit(sae->sae_rand, 1);
- sae->sae_rand = sae_get_rand(sae);
- if (sae->sae_rand == NULL)
+ crypto_bignum_deinit(sae->tmp->sae_rand, 1);
+ sae->tmp->sae_rand = sae_get_rand(sae);
+ if (sae->tmp->sae_rand == NULL)
return NULL;
return sae_get_rand(sae);
}
int y_bit;
size_t bits;
- if (crypto_bignum_to_bin(sae->prime, prime, sizeof(prime),
- sae->prime_len) < 0)
+ if (crypto_bignum_to_bin(sae->tmp->prime, prime, sizeof(prime),
+ sae->tmp->prime_len) < 0)
return -1;
wpa_hexdump_key(MSG_DEBUG, "SAE: pwd-seed", pwd_seed, SHA256_MAC_LEN);
/* pwd-value = KDF-z(pwd-seed, "SAE Hunting and Pecking", p) */
- bits = crypto_ec_prime_len_bits(sae->ec);
+ bits = crypto_ec_prime_len_bits(sae->tmp->ec);
sha256_prf_bits(pwd_seed, SHA256_MAC_LEN, "SAE Hunting and Pecking",
- prime, sae->prime_len, pwd_value, bits);
+ prime, sae->tmp->prime_len, pwd_value, bits);
if (bits % 8)
buf_shift_right(pwd_value, sizeof(pwd_value), 8 - bits % 8);
wpa_hexdump_key(MSG_DEBUG, "SAE: pwd-value",
- pwd_value, sae->prime_len);
+ pwd_value, sae->tmp->prime_len);
- if (os_memcmp(pwd_value, prime, sae->prime_len) >= 0)
+ if (os_memcmp(pwd_value, prime, sae->tmp->prime_len) >= 0)
return 0;
y_bit = pwd_seed[SHA256_MAC_LEN - 1] & 0x01;
- x = crypto_bignum_init_set(pwd_value, sae->prime_len);
+ x = crypto_bignum_init_set(pwd_value, sae->tmp->prime_len);
if (x == NULL)
return -1;
- if (crypto_ec_point_solve_y_coord(sae->ec, pwe, x, y_bit) < 0) {
+ if (crypto_ec_point_solve_y_coord(sae->tmp->ec, pwe, x, y_bit) < 0) {
crypto_bignum_deinit(x, 0);
wpa_printf(MSG_DEBUG, "SAE: No solution found");
return 0;
static int sae_test_pwd_seed_ffc(struct sae_data *sae, const u8 *pwd_seed,
struct crypto_bignum *pwe)
{
- u8 pwd_value[SAE_MAX_PRIME_LEN], pwe_bin[SAE_MAX_PRIME_LEN];
- size_t bits = sae->prime_len * 8;
+ u8 pwd_value[SAE_MAX_PRIME_LEN];
+ size_t bits = sae->tmp->prime_len * 8;
u8 exp[1];
struct crypto_bignum *a, *b;
int res;
/* pwd-value = KDF-z(pwd-seed, "SAE Hunting and Pecking", p) */
sha256_prf_bits(pwd_seed, SHA256_MAC_LEN, "SAE Hunting and Pecking",
- sae->dh->prime, sae->prime_len, pwd_value, bits);
+ sae->tmp->dh->prime, sae->tmp->prime_len, pwd_value,
+ bits);
if (bits % 8)
buf_shift_right(pwd_value, sizeof(pwd_value), 8 - bits % 8);
- wpa_hexdump_key(MSG_DEBUG, "SAE: pwd-value", pwd_value, sae->prime_len);
+ wpa_hexdump_key(MSG_DEBUG, "SAE: pwd-value", pwd_value,
+ sae->tmp->prime_len);
- if (os_memcmp(pwd_value, sae->dh->prime, sae->prime_len) >= 0) {
+ if (os_memcmp(pwd_value, sae->tmp->dh->prime, sae->tmp->prime_len) >= 0)
+ {
wpa_printf(MSG_DEBUG, "SAE: pwd-value >= p");
return 0;
}
/* PWE = pwd-value^((p-1)/r) modulo p */
- a = crypto_bignum_init_set(pwd_value, sae->prime_len);
+ a = crypto_bignum_init_set(pwd_value, sae->tmp->prime_len);
- if (sae->dh->safe_prime) {
+ if (sae->tmp->dh->safe_prime) {
/*
* r = (p-1)/2 for the group used here, so this becomes:
* PWE = pwd-value^2 modulo p
*/
exp[0] = 2;
b = crypto_bignum_init_set(exp, sizeof(exp));
- if (a == NULL || b == NULL)
- res = -1;
- else
- res = crypto_bignum_exptmod(a, b, sae->prime, pwe);
} else {
- struct crypto_bignum *tmp;
-
+ /* Calculate exponent: (p-1)/r */
exp[0] = 1;
b = crypto_bignum_init_set(exp, sizeof(exp));
- tmp = crypto_bignum_init();
- if (a == NULL || b == NULL || tmp == NULL ||
- crypto_bignum_sub(sae->prime, b, tmp) < 0 ||
- crypto_bignum_div(tmp, sae->order, b) < 0)
- res = -1;
- else
- res = crypto_bignum_exptmod(a, b, sae->prime, pwe);
- crypto_bignum_deinit(tmp, 0);
+ if (b == NULL ||
+ crypto_bignum_sub(sae->tmp->prime, b, b) < 0 ||
+ crypto_bignum_div(b, sae->tmp->order, b) < 0) {
+ crypto_bignum_deinit(b, 0);
+ b = NULL;
+ }
}
+ if (a == NULL || b == NULL)
+ res = -1;
+ else
+ res = crypto_bignum_exptmod(a, b, sae->tmp->prime, pwe);
+
crypto_bignum_deinit(a, 0);
crypto_bignum_deinit(b, 0);
return -1;
}
- res = crypto_bignum_to_bin(pwe, pwe_bin, sizeof(pwe_bin),
- sae->prime_len);
- if (res < 0) {
- wpa_printf(MSG_DEBUG, "SAE: Not room for PWE");
- return -1;
- }
- wpa_hexdump_key(MSG_DEBUG, "SAE: PWE candidate", pwe_bin, res);
-
/* if (PWE > 1) --> found */
- if (val_zero_or_one(pwe_bin, sae->prime_len)) {
+ if (crypto_bignum_is_zero(pwe) || crypto_bignum_is_one(pwe)) {
wpa_printf(MSG_DEBUG, "SAE: PWE <= 1");
return 0;
}
int found = 0;
struct crypto_ec_point *pwe_tmp;
- if (sae->pwe_ecc == NULL) {
- sae->pwe_ecc = crypto_ec_point_init(sae->ec);
- if (sae->pwe_ecc == NULL)
+ if (sae->tmp->pwe_ecc == NULL) {
+ sae->tmp->pwe_ecc = crypto_ec_point_init(sae->tmp->ec);
+ if (sae->tmp->pwe_ecc == NULL)
return -1;
}
- pwe_tmp = crypto_ec_point_init(sae->ec);
+ pwe_tmp = crypto_ec_point_init(sae->tmp->ec);
if (pwe_tmp == NULL)
return -1;
pwd_seed) < 0)
break;
res = sae_test_pwd_seed_ecc(sae, pwd_seed,
- found ? pwe_tmp : sae->pwe_ecc);
+ found ? pwe_tmp :
+ sae->tmp->pwe_ecc);
if (res < 0)
break;
if (res == 0)
size_t len[2];
int found = 0;
- if (sae->pwe_ffc == NULL) {
- sae->pwe_ffc = crypto_bignum_init();
- if (sae->pwe_ffc == NULL)
+ if (sae->tmp->pwe_ffc == NULL) {
+ sae->tmp->pwe_ffc = crypto_bignum_init();
+ if (sae->tmp->pwe_ffc == NULL)
return -1;
}
if (hmac_sha256_vector(addrs, sizeof(addrs), 2, addr, len,
pwd_seed) < 0)
break;
- res = sae_test_pwd_seed_ffc(sae, pwd_seed, sae->pwe_ffc);
+ res = sae_test_pwd_seed_ffc(sae, pwd_seed, sae->tmp->pwe_ffc);
if (res < 0)
break;
if (res > 0) {
}
-static int sae_derive_commit_ecc(struct sae_data *sae)
+static int sae_derive_commit_element_ecc(struct sae_data *sae,
+ struct crypto_bignum *mask)
{
- struct crypto_bignum *mask;
- int ret = -1;
+ /* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
+ if (!sae->tmp->own_commit_element_ecc) {
+ sae->tmp->own_commit_element_ecc =
+ crypto_ec_point_init(sae->tmp->ec);
+ if (!sae->tmp->own_commit_element_ecc)
+ return -1;
+ }
- mask = sae_get_rand_and_mask(sae);
- if (mask == NULL) {
- wpa_printf(MSG_DEBUG, "SAE: Could not get rand/mask");
+ if (crypto_ec_point_mul(sae->tmp->ec, sae->tmp->pwe_ecc, mask,
+ sae->tmp->own_commit_element_ecc) < 0 ||
+ crypto_ec_point_invert(sae->tmp->ec,
+ sae->tmp->own_commit_element_ecc) < 0) {
+ wpa_printf(MSG_DEBUG, "SAE: Could not compute commit-element");
return -1;
}
- /* commit-scalar = (rand + mask) modulo r */
- if (!sae->own_commit_scalar) {
- sae->own_commit_scalar = crypto_bignum_init();
- if (!sae->own_commit_scalar)
- goto fail;
- }
- crypto_bignum_add(sae->sae_rand, mask, sae->own_commit_scalar);
- crypto_bignum_mod(sae->own_commit_scalar, sae->order,
- sae->own_commit_scalar);
+ return 0;
+}
+
+static int sae_derive_commit_element_ffc(struct sae_data *sae,
+ struct crypto_bignum *mask)
+{
/* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
- if (!sae->own_commit_element_ecc) {
- sae->own_commit_element_ecc = crypto_ec_point_init(sae->ec);
- if (!sae->own_commit_element_ecc)
- goto fail;
+ if (!sae->tmp->own_commit_element_ffc) {
+ sae->tmp->own_commit_element_ffc = crypto_bignum_init();
+ if (!sae->tmp->own_commit_element_ffc)
+ return -1;
}
- if (crypto_ec_point_mul(sae->ec, sae->pwe_ecc, mask,
- sae->own_commit_element_ecc) < 0 ||
- crypto_ec_point_invert(sae->ec, sae->own_commit_element_ecc) < 0) {
+
+ if (crypto_bignum_exptmod(sae->tmp->pwe_ffc, mask, sae->tmp->prime,
+ sae->tmp->own_commit_element_ffc) < 0 ||
+ crypto_bignum_inverse(sae->tmp->own_commit_element_ffc,
+ sae->tmp->prime,
+ sae->tmp->own_commit_element_ffc) < 0) {
wpa_printf(MSG_DEBUG, "SAE: Could not compute commit-element");
- goto fail;
+ return -1;
}
- ret = 0;
-fail:
- crypto_bignum_deinit(mask, 1);
- return ret;
+ return 0;
}
-static int sae_derive_commit_ffc(struct sae_data *sae)
+static int sae_derive_commit(struct sae_data *sae)
{
struct crypto_bignum *mask;
int ret = -1;
}
/* commit-scalar = (rand + mask) modulo r */
- if (!sae->own_commit_scalar) {
- sae->own_commit_scalar = crypto_bignum_init();
- if (!sae->own_commit_scalar)
+ if (!sae->tmp->own_commit_scalar) {
+ sae->tmp->own_commit_scalar = crypto_bignum_init();
+ if (!sae->tmp->own_commit_scalar)
goto fail;
}
- crypto_bignum_add(sae->sae_rand, mask, sae->own_commit_scalar);
- crypto_bignum_mod(sae->own_commit_scalar, sae->order,
- sae->own_commit_scalar);
+ crypto_bignum_add(sae->tmp->sae_rand, mask,
+ sae->tmp->own_commit_scalar);
+ crypto_bignum_mod(sae->tmp->own_commit_scalar, sae->tmp->order,
+ sae->tmp->own_commit_scalar);
- /* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
- if (!sae->own_commit_element_ffc) {
- sae->own_commit_element_ffc = crypto_bignum_init();
- if (!sae->own_commit_element_ffc)
- goto fail;
- }
- if (crypto_bignum_exptmod(sae->pwe_ffc, mask, sae->prime,
- sae->own_commit_element_ffc) < 0 ||
- crypto_bignum_inverse(sae->own_commit_element_ffc, sae->prime,
- sae->own_commit_element_ffc) < 0) {
- wpa_printf(MSG_DEBUG, "SAE: Could not compute commit-element");
+ if (sae->tmp->ec && sae_derive_commit_element_ecc(sae, mask) < 0)
+ goto fail;
+ if (sae->tmp->dh && sae_derive_commit_element_ffc(sae, mask) < 0)
goto fail;
- }
ret = 0;
fail:
const u8 *password, size_t password_len,
struct sae_data *sae)
{
- if (sae->ec) {
- if (sae_derive_pwe_ecc(sae, addr1, addr2, password,
- password_len) < 0 ||
- sae_derive_commit_ecc(sae) < 0)
- return -1;
- return 0;
- }
-
- if (sae->dh) {
- if (sae_derive_pwe_ffc(sae, addr1, addr2, password,
- password_len) < 0 ||
- sae_derive_commit_ffc(sae) < 0)
- return -1;
- return 0;
- }
-
- return -1;
+ if (sae->tmp == NULL)
+ return -1;
+ if (sae->tmp->ec && sae_derive_pwe_ecc(sae, addr1, addr2, password,
+ password_len) < 0)
+ return -1;
+ if (sae->tmp->dh && sae_derive_pwe_ffc(sae, addr1, addr2, password,
+ password_len) < 0)
+ return -1;
+ if (sae_derive_commit(sae) < 0)
+ return -1;
+ return 0;
}
struct crypto_ec_point *K;
int ret = -1;
- K = crypto_ec_point_init(sae->ec);
+ K = crypto_ec_point_init(sae->tmp->ec);
if (K == NULL)
goto fail;
- if (!crypto_ec_point_is_on_curve(sae->ec, sae->peer_commit_element_ecc))
- {
- wpa_printf(MSG_DEBUG, "SAE: Peer element is not on curve");
- goto fail;
- }
-
/*
* K = scalar-op(rand, (elem-op(scalar-op(peer-commit-scalar, PWE),
* PEER-COMMIT-ELEMENT)))
* k = F(K) (= x coordinate)
*/
- if (crypto_ec_point_mul(sae->ec, sae->pwe_ecc, sae->peer_commit_scalar,
- K) < 0 ||
- crypto_ec_point_add(sae->ec, K, sae->peer_commit_element_ecc, K) < 0
- ||
- crypto_ec_point_mul(sae->ec, K, sae->sae_rand, K) < 0 ||
- crypto_ec_point_is_at_infinity(sae->ec, K) ||
- crypto_ec_point_to_bin(sae->ec, K, k, NULL) < 0) {
+ if (crypto_ec_point_mul(sae->tmp->ec, sae->tmp->pwe_ecc,
+ sae->peer_commit_scalar, K) < 0 ||
+ crypto_ec_point_add(sae->tmp->ec, K,
+ sae->tmp->peer_commit_element_ecc, K) < 0 ||
+ crypto_ec_point_mul(sae->tmp->ec, K, sae->tmp->sae_rand, K) < 0 ||
+ crypto_ec_point_is_at_infinity(sae->tmp->ec, K) ||
+ crypto_ec_point_to_bin(sae->tmp->ec, K, k, NULL) < 0) {
wpa_printf(MSG_DEBUG, "SAE: Failed to calculate K and k");
goto fail;
}
- wpa_hexdump_key(MSG_DEBUG, "SAE: k", k, sae->prime_len);
+ wpa_hexdump_key(MSG_DEBUG, "SAE: k", k, sae->tmp->prime_len);
ret = 0;
fail:
* k = F(K) (= x coordinate)
*/
- if (crypto_bignum_exptmod(sae->pwe_ffc, sae->peer_commit_scalar,
- sae->prime, K) < 0 ||
- crypto_bignum_mulmod(K, sae->peer_commit_element_ffc, sae->prime, K)
- < 0 ||
- crypto_bignum_exptmod(K, sae->sae_rand, sae->prime, K) < 0 ||
- crypto_bignum_to_bin(K, k, SAE_MAX_PRIME_LEN, sae->prime_len) < 0 ||
- val_one(k, sae->prime_len)) {
+ if (crypto_bignum_exptmod(sae->tmp->pwe_ffc, sae->peer_commit_scalar,
+ sae->tmp->prime, K) < 0 ||
+ crypto_bignum_mulmod(K, sae->tmp->peer_commit_element_ffc,
+ sae->tmp->prime, K) < 0 ||
+ crypto_bignum_exptmod(K, sae->tmp->sae_rand, sae->tmp->prime, K) < 0
+ ||
+ crypto_bignum_is_one(K) ||
+ crypto_bignum_to_bin(K, k, SAE_MAX_PRIME_LEN, sae->tmp->prime_len) <
+ 0) {
wpa_printf(MSG_DEBUG, "SAE: Failed to calculate K and k");
goto fail;
}
- wpa_hexdump_key(MSG_DEBUG, "SAE: k", k, sae->prime_len);
+ wpa_hexdump_key(MSG_DEBUG, "SAE: k", k, sae->tmp->prime_len);
ret = 0;
fail:
}
-static int sae_derive_k(struct sae_data *sae, u8 *k)
-{
- if (sae->ec)
- return sae_derive_k_ecc(sae, k);
- return sae_derive_k_ffc(sae, k);
-}
-
-
static int sae_derive_keys(struct sae_data *sae, const u8 *k)
{
u8 null_key[SAE_KEYSEED_KEY_LEN], val[SAE_MAX_PRIME_LEN];
*/
os_memset(null_key, 0, sizeof(null_key));
- hmac_sha256(null_key, sizeof(null_key), k, sae->prime_len, keyseed);
+ hmac_sha256(null_key, sizeof(null_key), k, sae->tmp->prime_len,
+ keyseed);
wpa_hexdump_key(MSG_DEBUG, "SAE: keyseed", keyseed, sizeof(keyseed));
- crypto_bignum_add(sae->own_commit_scalar, sae->peer_commit_scalar, tmp);
- crypto_bignum_mod(tmp, sae->order, tmp);
- crypto_bignum_to_bin(tmp, val, sizeof(val), sae->prime_len);
+ crypto_bignum_add(sae->tmp->own_commit_scalar, sae->peer_commit_scalar,
+ tmp);
+ crypto_bignum_mod(tmp, sae->tmp->order, tmp);
+ crypto_bignum_to_bin(tmp, val, sizeof(val), sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: PMKID", val, SAE_PMKID_LEN);
sha256_prf(keyseed, sizeof(keyseed), "SAE KCK and PMK",
- val, sae->prime_len, keys, sizeof(keys));
- os_memcpy(sae->kck, keys, SAE_KCK_LEN);
+ val, sae->tmp->prime_len, keys, sizeof(keys));
+ os_memcpy(sae->tmp->kck, keys, SAE_KCK_LEN);
os_memcpy(sae->pmk, keys + SAE_KCK_LEN, SAE_PMK_LEN);
- wpa_hexdump_key(MSG_DEBUG, "SAE: KCK", sae->kck, SAE_KCK_LEN);
+ wpa_hexdump_key(MSG_DEBUG, "SAE: KCK", sae->tmp->kck, SAE_KCK_LEN);
wpa_hexdump_key(MSG_DEBUG, "SAE: PMK", sae->pmk, SAE_PMK_LEN);
ret = 0;
int sae_process_commit(struct sae_data *sae)
{
u8 k[SAE_MAX_PRIME_LEN];
- if (sae_derive_k(sae, k) < 0 || sae_derive_keys(sae, k) < 0)
+ if (sae->tmp == NULL ||
+ (sae->tmp->ec && sae_derive_k_ecc(sae, k) < 0) ||
+ (sae->tmp->dh && sae_derive_k_ffc(sae, k) < 0) ||
+ sae_derive_keys(sae, k) < 0)
return -1;
return 0;
}
const struct wpabuf *token)
{
u8 *pos;
+
+ if (sae->tmp == NULL)
+ return;
+
wpabuf_put_le16(buf, sae->group); /* Finite Cyclic Group */
- if (token)
+ if (token) {
wpabuf_put_buf(buf, token);
- pos = wpabuf_put(buf, sae->prime_len);
- crypto_bignum_to_bin(sae->own_commit_scalar, pos, sae->prime_len,
- sae->prime_len);
- wpa_hexdump(MSG_DEBUG, "SAE: own commit-scalar", pos, sae->prime_len);
- if (sae->ec) {
- pos = wpabuf_put(buf, 2 * sae->prime_len);
- crypto_ec_point_to_bin(sae->ec, sae->own_commit_element_ecc,
- pos, pos + sae->prime_len);
+ wpa_hexdump(MSG_DEBUG, "SAE: Anti-clogging token",
+ wpabuf_head(token), wpabuf_len(token));
+ }
+ pos = wpabuf_put(buf, sae->tmp->prime_len);
+ crypto_bignum_to_bin(sae->tmp->own_commit_scalar, pos,
+ sae->tmp->prime_len, sae->tmp->prime_len);
+ wpa_hexdump(MSG_DEBUG, "SAE: own commit-scalar",
+ pos, sae->tmp->prime_len);
+ if (sae->tmp->ec) {
+ pos = wpabuf_put(buf, 2 * sae->tmp->prime_len);
+ crypto_ec_point_to_bin(sae->tmp->ec,
+ sae->tmp->own_commit_element_ecc,
+ pos, pos + sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: own commit-element(x)",
- pos, sae->prime_len);
+ pos, sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: own commit-element(y)",
- pos + sae->prime_len, sae->prime_len);
+ pos + sae->tmp->prime_len, sae->tmp->prime_len);
} else {
- pos = wpabuf_put(buf, sae->prime_len);
- crypto_bignum_to_bin(sae->own_commit_element_ffc, pos,
- sae->prime_len, sae->prime_len);
+ pos = wpabuf_put(buf, sae->tmp->prime_len);
+ crypto_bignum_to_bin(sae->tmp->own_commit_element_ffc, pos,
+ sae->tmp->prime_len, sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: own commit-element",
- pos, sae->prime_len);
+ pos, sae->tmp->prime_len);
}
}
{
if (allowed_groups) {
int i;
- for (i = 0; allowed_groups[i] >= 0; i++) {
+ for (i = 0; allowed_groups[i] > 0; i++) {
if (allowed_groups[i] == group)
break;
}
return WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED;
}
- if (sae->dh && !allowed_groups) {
+ if (sae->tmp == NULL) {
+ wpa_printf(MSG_DEBUG, "SAE: Group information not yet initialized");
+ return WLAN_STATUS_UNSPECIFIED_FAILURE;
+ }
+
+ if (sae->tmp->dh && !allowed_groups) {
wpa_printf(MSG_DEBUG, "SAE: Do not allow FFC group %u without "
"explicit configuration enabling it", group);
return WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED;
const u8 *end, const u8 **token,
size_t *token_len)
{
- if (*pos + (sae->ec ? 3 : 2) * sae->prime_len < end) {
- size_t tlen = end - (*pos + (sae->ec ? 3 : 2) * sae->prime_len);
+ if (*pos + (sae->tmp->ec ? 3 : 2) * sae->tmp->prime_len < end) {
+ size_t tlen = end - (*pos + (sae->tmp->ec ? 3 : 2) *
+ sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: Anti-Clogging Token", *pos, tlen);
if (token)
*token = *pos;
{
struct crypto_bignum *peer_scalar;
- if (*pos + sae->prime_len > end) {
+ if (*pos + sae->tmp->prime_len > end) {
wpa_printf(MSG_DEBUG, "SAE: Not enough data for scalar");
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
- peer_scalar = crypto_bignum_init_set(*pos, sae->prime_len);
+ peer_scalar = crypto_bignum_init_set(*pos, sae->tmp->prime_len);
if (peer_scalar == NULL)
return WLAN_STATUS_UNSPECIFIED_FAILURE;
/* 0 < scalar < r */
if (crypto_bignum_is_zero(peer_scalar) ||
- crypto_bignum_cmp(peer_scalar, sae->order) >= 0) {
+ crypto_bignum_cmp(peer_scalar, sae->tmp->order) >= 0) {
wpa_printf(MSG_DEBUG, "SAE: Invalid peer scalar");
crypto_bignum_deinit(peer_scalar, 0);
return WLAN_STATUS_UNSPECIFIED_FAILURE;
crypto_bignum_deinit(sae->peer_commit_scalar, 0);
sae->peer_commit_scalar = peer_scalar;
- wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-scalar", *pos, sae->prime_len);
- *pos += sae->prime_len;
+ wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-scalar",
+ *pos, sae->tmp->prime_len);
+ *pos += sae->tmp->prime_len;
return WLAN_STATUS_SUCCESS;
}
{
u8 prime[SAE_MAX_ECC_PRIME_LEN];
- if (pos + 2 * sae->prime_len > end) {
+ if (pos + 2 * sae->tmp->prime_len > end) {
wpa_printf(MSG_DEBUG, "SAE: Not enough data for "
"commit-element");
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
- if (crypto_bignum_to_bin(sae->prime, prime, sizeof(prime),
- sae->prime_len) < 0)
+ if (crypto_bignum_to_bin(sae->tmp->prime, prime, sizeof(prime),
+ sae->tmp->prime_len) < 0)
return WLAN_STATUS_UNSPECIFIED_FAILURE;
/* element x and y coordinates < p */
- if (os_memcmp(pos, prime, sae->prime_len) >= 0 ||
- os_memcmp(pos + sae->prime_len + sae->prime_len, prime,
- sae->prime_len) >= 0) {
+ if (os_memcmp(pos, prime, sae->tmp->prime_len) >= 0 ||
+ os_memcmp(pos + sae->tmp->prime_len, prime,
+ sae->tmp->prime_len) >= 0) {
wpa_printf(MSG_DEBUG, "SAE: Invalid coordinates in peer "
"element");
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-element(x)",
- pos, sae->prime_len);
+ pos, sae->tmp->prime_len);
wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-element(y)",
- pos + sae->prime_len, sae->prime_len);
+ pos + sae->tmp->prime_len, sae->tmp->prime_len);
- crypto_ec_point_deinit(sae->peer_commit_element_ecc, 0);
- sae->peer_commit_element_ecc = crypto_ec_point_from_bin(sae->ec, pos);
- if (sae->peer_commit_element_ecc == NULL)
+ crypto_ec_point_deinit(sae->tmp->peer_commit_element_ecc, 0);
+ sae->tmp->peer_commit_element_ecc =
+ crypto_ec_point_from_bin(sae->tmp->ec, pos);
+ if (sae->tmp->peer_commit_element_ecc == NULL)
return WLAN_STATUS_UNSPECIFIED_FAILURE;
+ if (!crypto_ec_point_is_on_curve(sae->tmp->ec,
+ sae->tmp->peer_commit_element_ecc)) {
+ wpa_printf(MSG_DEBUG, "SAE: Peer element is not on curve");
+ return WLAN_STATUS_UNSPECIFIED_FAILURE;
+ }
+
return WLAN_STATUS_SUCCESS;
}
static u16 sae_parse_commit_element_ffc(struct sae_data *sae, const u8 *pos,
const u8 *end)
{
- if (pos + sae->prime_len > end) {
+ struct crypto_bignum *res;
+
+ if (pos + sae->tmp->prime_len > end) {
wpa_printf(MSG_DEBUG, "SAE: Not enough data for "
"commit-element");
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
- wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-element", pos, sae->prime_len);
+ wpa_hexdump(MSG_DEBUG, "SAE: Peer commit-element", pos,
+ sae->tmp->prime_len);
- if (val_zero_or_one(pos, sae->prime_len)) {
+ crypto_bignum_deinit(sae->tmp->peer_commit_element_ffc, 0);
+ sae->tmp->peer_commit_element_ffc =
+ crypto_bignum_init_set(pos, sae->tmp->prime_len);
+ if (sae->tmp->peer_commit_element_ffc == NULL)
+ return WLAN_STATUS_UNSPECIFIED_FAILURE;
+ if (crypto_bignum_is_zero(sae->tmp->peer_commit_element_ffc) ||
+ crypto_bignum_is_one(sae->tmp->peer_commit_element_ffc) ||
+ crypto_bignum_cmp(sae->tmp->peer_commit_element_ffc,
+ sae->tmp->prime) >= 0) {
wpa_printf(MSG_DEBUG, "SAE: Invalid peer element");
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
- crypto_bignum_deinit(sae->peer_commit_element_ffc, 0);
- sae->peer_commit_element_ffc = crypto_bignum_init_set(pos,
- sae->prime_len);
- if (sae->peer_commit_element_ffc == NULL)
- return WLAN_STATUS_UNSPECIFIED_FAILURE;
- if (crypto_bignum_cmp(sae->peer_commit_element_ffc, sae->prime) >= 0) {
- wpa_printf(MSG_DEBUG, "SAE: Invalid peer element");
+ /* scalar-op(r, ELEMENT) = 1 modulo p */
+ res = crypto_bignum_init();
+ if (res == NULL ||
+ crypto_bignum_exptmod(sae->tmp->peer_commit_element_ffc,
+ sae->tmp->order, sae->tmp->prime, res) < 0 ||
+ !crypto_bignum_is_one(res)) {
+ wpa_printf(MSG_DEBUG, "SAE: Invalid peer element (scalar-op)");
+ crypto_bignum_deinit(res, 0);
return WLAN_STATUS_UNSPECIFIED_FAILURE;
}
+ crypto_bignum_deinit(res, 0);
return WLAN_STATUS_SUCCESS;
}
static u16 sae_parse_commit_element(struct sae_data *sae, const u8 *pos,
const u8 *end)
{
- if (sae->dh)
+ if (sae->tmp->dh)
return sae_parse_commit_element_ffc(sae, pos, end);
return sae_parse_commit_element_ecc(sae, pos, end);
}
addr[0] = sc;
len[0] = 2;
crypto_bignum_to_bin(scalar1, scalar_b1, sizeof(scalar_b1),
- sae->prime_len);
+ sae->tmp->prime_len);
addr[1] = scalar_b1;
- len[1] = sae->prime_len;
+ len[1] = sae->tmp->prime_len;
addr[2] = element1;
len[2] = element1_len;
crypto_bignum_to_bin(scalar2, scalar_b2, sizeof(scalar_b2),
- sae->prime_len);
+ sae->tmp->prime_len);
addr[3] = scalar_b2;
- len[3] = sae->prime_len;
+ len[3] = sae->tmp->prime_len;
addr[4] = element2;
len[4] = element2_len;
- hmac_sha256_vector(sae->kck, sizeof(sae->kck), 5, addr, len, confirm);
+ hmac_sha256_vector(sae->tmp->kck, sizeof(sae->tmp->kck), 5, addr, len,
+ confirm);
}
u8 element_b1[2 * SAE_MAX_ECC_PRIME_LEN];
u8 element_b2[2 * SAE_MAX_ECC_PRIME_LEN];
- crypto_ec_point_to_bin(sae->ec, element1, element_b1,
- element_b1 + sae->prime_len);
- crypto_ec_point_to_bin(sae->ec, element2, element_b2,
- element_b2 + sae->prime_len);
+ crypto_ec_point_to_bin(sae->tmp->ec, element1, element_b1,
+ element_b1 + sae->tmp->prime_len);
+ crypto_ec_point_to_bin(sae->tmp->ec, element2, element_b2,
+ element_b2 + sae->tmp->prime_len);
- sae_cn_confirm(sae, sc, scalar1, element_b1, 2 * sae->prime_len,
- scalar2, element_b2, 2 * sae->prime_len, confirm);
+ sae_cn_confirm(sae, sc, scalar1, element_b1, 2 * sae->tmp->prime_len,
+ scalar2, element_b2, 2 * sae->tmp->prime_len, confirm);
}
u8 element_b2[SAE_MAX_PRIME_LEN];
crypto_bignum_to_bin(element1, element_b1, sizeof(element_b1),
- sae->prime_len);
+ sae->tmp->prime_len);
crypto_bignum_to_bin(element2, element_b2, sizeof(element_b2),
- sae->prime_len);
+ sae->tmp->prime_len);
- sae_cn_confirm(sae, sc, scalar1, element_b1, sae->prime_len,
- scalar2, element_b2, sae->prime_len, confirm);
+ sae_cn_confirm(sae, sc, scalar1, element_b1, sae->tmp->prime_len,
+ scalar2, element_b2, sae->tmp->prime_len, confirm);
}
{
const u8 *sc;
+ if (sae->tmp == NULL)
+ return;
+
/* Send-Confirm */
sc = wpabuf_put(buf, 0);
wpabuf_put_le16(buf, sae->send_confirm);
sae->send_confirm++;
- if (sae->ec)
- sae_cn_confirm_ecc(sae, sc, sae->own_commit_scalar,
- sae->own_commit_element_ecc,
+ if (sae->tmp->ec)
+ sae_cn_confirm_ecc(sae, sc, sae->tmp->own_commit_scalar,
+ sae->tmp->own_commit_element_ecc,
sae->peer_commit_scalar,
- sae->peer_commit_element_ecc,
+ sae->tmp->peer_commit_element_ecc,
wpabuf_put(buf, SHA256_MAC_LEN));
else
- sae_cn_confirm_ffc(sae, sc, sae->own_commit_scalar,
- sae->own_commit_element_ffc,
+ sae_cn_confirm_ffc(sae, sc, sae->tmp->own_commit_scalar,
+ sae->tmp->own_commit_element_ffc,
sae->peer_commit_scalar,
- sae->peer_commit_element_ffc,
+ sae->tmp->peer_commit_element_ffc,
wpabuf_put(buf, SHA256_MAC_LEN));
}
wpa_printf(MSG_DEBUG, "SAE: peer-send-confirm %u", WPA_GET_LE16(data));
- if (sae->ec)
+ if (sae->tmp == NULL) {
+ wpa_printf(MSG_DEBUG, "SAE: Temporary data not yet available");
+ return -1;
+ }
+
+ if (sae->tmp->ec)
sae_cn_confirm_ecc(sae, data, sae->peer_commit_scalar,
- sae->peer_commit_element_ecc,
- sae->own_commit_scalar,
- sae->own_commit_element_ecc,
+ sae->tmp->peer_commit_element_ecc,
+ sae->tmp->own_commit_scalar,
+ sae->tmp->own_commit_element_ecc,
verifier);
else
sae_cn_confirm_ffc(sae, data, sae->peer_commit_scalar,
- sae->peer_commit_element_ffc,
- sae->own_commit_scalar,
- sae->own_commit_element_ffc,
+ sae->tmp->peer_commit_element_ffc,
+ sae->tmp->own_commit_scalar,
+ sae->tmp->own_commit_element_ffc,
verifier);
- if (os_memcmp(verifier, data + 2, SHA256_MAC_LEN) != 0) {
+ if (os_memcmp_const(verifier, data + 2, SHA256_MAC_LEN) != 0) {
wpa_printf(MSG_DEBUG, "SAE: Confirm mismatch");
wpa_hexdump(MSG_DEBUG, "SAE: Received confirm",
data + 2, SHA256_MAC_LEN);
projects / mech_eap.git / blobdiff