jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SAE: Add support for FFC groups that do not use a safe prime

Browse source 
This allows DH groups 22, 23, 24 to be used with SAE.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-01-06 15:13:07 +02:00
parent 2ce12789c1
commit bf4f5d6570
2 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/common/sae.c
View file

@ -49,11 +49,9 @@ int sae_set_group(struct sae_data *sae, int group)
} }
sae->prime = sae->prime_buf; sae->prime = sae->prime_buf;
/* Assume r = (p-1)/2 for this group */ sae->order_buf = crypto_bignum_init_set(sae->dh->order,
sae->safe_prime = 1; sae->dh->order_len);
sae->order_buf = crypto_bignum_init(); if (sae->order_buf == NULL) {
if (sae->order_buf == NULL ||
crypto_bignum_rshift(sae->prime, 1, sae->order_buf) < 0) {
sae_clear_data(sae); sae_clear_data(sae);
return -1; return -1;
} }
@ -124,20 +122,20 @@ static void buf_shift_right(u8 *buf, size_t len, size_t bits)
} }
static int sae_get_rand(const u8 *order, size_t prime_len_bits, u8 *val) static int sae_get_rand(const u8 *order, size_t order_len_bits, u8 *val)
{ {
int iter = 0; int iter = 0;
size_t prime_len = (prime_len_bits + 7) / 8; size_t order_len = (order_len_bits + 7) / 8;
do { do {
if (iter++ > 100) if (iter++ > 100)
return -1; return -1;
if (random_get_bytes(val, prime_len) < 0) if (random_get_bytes(val, order_len) < 0)
return -1; return -1;
if (prime_len_bits % 8) if (order_len_bits % 8)
buf_shift_right(val, prime_len, 8 - prime_len_bits % 8); buf_shift_right(val, order_len, 8 - order_len_bits % 8);
} while (os_memcmp(val, order, prime_len) >= 0 || } while (os_memcmp(val, order, order_len) >= 0 ||
val_zero_or_one(val, prime_len)); val_zero_or_one(val, order_len));
return 0; return 0;
} }
@ -156,8 +154,9 @@ static struct crypto_bignum * sae_get_rand_and_mask(struct sae_data *sae)
if (sae_get_rand(order, prime_len_bits, sae->sae_rand) < 0 || if (sae_get_rand(order, prime_len_bits, sae->sae_rand) < 0 ||
sae_get_rand(order, prime_len_bits, mask) < 0) sae_get_rand(order, prime_len_bits, mask) < 0)
return NULL; return NULL;
sae->rand_len = sae->prime_len;
wpa_hexdump_key(MSG_DEBUG, "SAE: rand", wpa_hexdump_key(MSG_DEBUG, "SAE: rand",
sae->sae_rand, sae->prime_len); sae->sae_rand, sae->rand_len);
wpa_hexdump_key(MSG_DEBUG, "SAE: mask", mask, sae->prime_len); wpa_hexdump_key(MSG_DEBUG, "SAE: mask", mask, sae->prime_len);
bn = crypto_bignum_init_set(mask, sae->prime_len); bn = crypto_bignum_init_set(mask, sae->prime_len);
os_memset(mask, 0, sizeof(mask)); os_memset(mask, 0, sizeof(mask));
@ -167,20 +166,18 @@ static struct crypto_bignum * sae_get_rand_and_mask(struct sae_data *sae)
static struct crypto_bignum * sae_get_rand_and_mask_dh(struct sae_data *sae) static struct crypto_bignum * sae_get_rand_and_mask_dh(struct sae_data *sae)
{ {
u8 mask[SAE_MAX_PRIME_LEN], order[SAE_MAX_PRIME_LEN]; u8 mask[SAE_MAX_PRIME_LEN];
struct crypto_bignum *bn; struct crypto_bignum *bn;
size_t prime_len_bits = sae->prime_len * 8;
if (crypto_bignum_to_bin(sae->order, order, sizeof(order), if (sae_get_rand(sae->dh->order, sae->dh->order_len * 8, sae->sae_rand)
sae->prime_len) < 0 || < 0 ||
sae_get_rand(order, prime_len_bits, sae->sae_rand) < 0 || sae_get_rand(sae->dh->order, sae->dh->order_len * 8, mask) < 0)
sae_get_rand(order, prime_len_bits, mask) < 0)
return NULL; return NULL;
wpa_hexdump_key(MSG_DEBUG, "SAE: rand", sae->rand_len = sae->dh->order_len;
sae->sae_rand, sae->prime_len); wpa_hexdump_key(MSG_DEBUG, "SAE: rand", sae->sae_rand, sae->rand_len);
wpa_hexdump_key(MSG_DEBUG, "SAE: mask", mask, sae->prime_len); wpa_hexdump_key(MSG_DEBUG, "SAE: mask", mask, sae->dh->order_len);
bn = crypto_bignum_init_set(mask, sae->prime_len); bn = crypto_bignum_init_set(mask, sae->dh->order_len);
os_memset(mask, 0, sizeof(mask)); os_memset(mask, 0, sizeof(mask));
return bn; return bn;
} }
@ -337,7 +334,7 @@ static int sae_derive_commit(struct sae_data *sae, struct crypto_ec_point *pwe)
} }
x = crypto_bignum_init(); x = crypto_bignum_init();
bn_rand = crypto_bignum_init_set(sae->sae_rand, sae->prime_len); bn_rand = crypto_bignum_init_set(sae->sae_rand, sae->rand_len);
elem = crypto_ec_point_init(sae->ec); elem = crypto_ec_point_init(sae->ec);
if (x == NULL || bn_rand == NULL || elem == NULL) if (x == NULL || bn_rand == NULL || elem == NULL)
goto fail; goto fail;
@ -422,7 +419,7 @@ static int sae_test_pwd_seed_dh(struct sae_data *sae, const u8 *pwd_seed,
a = crypto_bignum_init_set(pwd_value, sae->prime_len); a = crypto_bignum_init_set(pwd_value, sae->prime_len);
if (sae->safe_prime) { if (sae->dh->safe_prime) {
/* /*
* r = (p-1)/2 for the group used here, so this becomes: * r = (p-1)/2 for the group used here, so this becomes:
* PWE = pwd-value^2 modulo p * PWE = pwd-value^2 modulo p
@ -539,7 +536,7 @@ static int sae_derive_commit_dh(struct sae_data *sae, struct crypto_bignum *pwe)
} }
x = crypto_bignum_init(); x = crypto_bignum_init();
bn_rand = crypto_bignum_init_set(sae->sae_rand, sae->prime_len); bn_rand = crypto_bignum_init_set(sae->sae_rand, sae->rand_len);
elem = crypto_bignum_init(); elem = crypto_bignum_init();
if (x == NULL || bn_rand == NULL || elem == NULL) if (x == NULL || bn_rand == NULL || elem == NULL)
goto fail; goto fail;
@ -664,7 +661,7 @@ static int sae_derive_k_ec(struct sae_data *sae, u8 *k)
sae->prime_len); sae->prime_len);
peer_elem = crypto_ec_point_from_bin(sae->ec, sae->peer_commit_element); peer_elem = crypto_ec_point_from_bin(sae->ec, sae->peer_commit_element);
K = crypto_ec_point_init(sae->ec); K = crypto_ec_point_init(sae->ec);
rand_bn = crypto_bignum_init_set(sae->sae_rand, sae->prime_len); rand_bn = crypto_bignum_init_set(sae->sae_rand, sae->rand_len);
if (pwe == NULL || peer_elem == NULL || peer_scalar == NULL || if (pwe == NULL || peer_elem == NULL || peer_scalar == NULL ||
K == NULL || rand_bn == NULL) K == NULL || rand_bn == NULL)
goto fail; goto fail;
@ -713,7 +710,7 @@ static int sae_derive_k_dh(struct sae_data *sae, u8 *k)
peer_elem = crypto_bignum_init_set(sae->peer_commit_element, peer_elem = crypto_bignum_init_set(sae->peer_commit_element,
sae->prime_len); sae->prime_len);
K = crypto_bignum_init(); K = crypto_bignum_init();
rand_bn = crypto_bignum_init_set(sae->sae_rand, sae->prime_len); rand_bn = crypto_bignum_init_set(sae->sae_rand, sae->rand_len);
if (pwe == NULL || peer_elem == NULL || peer_scalar == NULL || if (pwe == NULL || peer_elem == NULL || peer_scalar == NULL ||
K == NULL || rand_bn == NULL) K == NULL || rand_bn == NULL)
goto fail; goto fail;

2
src/common/sae.h
View file

@ -28,6 +28,7 @@ struct sae_data {
u8 peer_commit_element[2 * SAE_MAX_PRIME_LEN]; u8 peer_commit_element[2 * SAE_MAX_PRIME_LEN];
u8 pwe[2 * SAE_MAX_PRIME_LEN]; u8 pwe[2 * SAE_MAX_PRIME_LEN];
u8 sae_rand[SAE_MAX_PRIME_LEN]; u8 sae_rand[SAE_MAX_PRIME_LEN];
size_t rand_len;
int group; int group;
struct crypto_ec *ec; struct crypto_ec *ec;
int prime_len; int prime_len;
@ -36,7 +37,6 @@ struct sae_data {
const struct crypto_bignum *order; const struct crypto_bignum *order;
struct crypto_bignum *prime_buf; struct crypto_bignum *prime_buf;
struct crypto_bignum *order_buf; struct crypto_bignum *order_buf;
int safe_prime;
}; };
int sae_set_group(struct sae_data *sae, int group); int sae_set_group(struct sae_data *sae, int group);