EAP-pwd: Use abstract crypto API
This makes it easier to use EAP-pwd with other crypto libraries than OpenSSL. Signed-off-by: Sean Parkinson <sean@wolfssl.com>
This commit is contained in:
Sean Parkinson
Jouni Malinen
parent
0c3d49afd8
commit
04b1bcc5f3
8 changed files with 319 additions and 541 deletions
|
|
@ -11,6 +11,7 @@
|
|||
#include "common.h"
|
||||
#include "crypto/sha256.h"
|
||||
#include "crypto/ms_funcs.h"
|
||||
#include "crypto/crypto.h"
|
||||
#include "eap_peer/eap_i.h"
|
||||
#include "eap_common/eap_pwd_common.h"
|
||||
|
||||
|
|
@ -36,18 +37,16 @@ struct eap_pwd_data {
|
|||
size_t out_frag_pos;
|
||||
size_t mtu;
|
||||
|
||||
BIGNUM *k;
|
||||
BIGNUM *private_value;
|
||||
BIGNUM *server_scalar;
|
||||
BIGNUM *my_scalar;
|
||||
EC_POINT *my_element;
|
||||
EC_POINT *server_element;
|
||||
struct crypto_bignum *k;
|
||||
struct crypto_bignum *private_value;
|
||||
struct crypto_bignum *server_scalar;
|
||||
struct crypto_bignum *my_scalar;
|
||||
struct crypto_ec_point *my_element;
|
||||
struct crypto_ec_point *server_element;
|
||||
|
||||
u8 msk[EAP_MSK_LEN];
|
||||
u8 emsk[EAP_EMSK_LEN];
|
||||
u8 session_id[1 + SHA256_MAC_LEN];
|
||||
|
||||
BN_CTX *bnctx;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -107,15 +106,8 @@ static void * eap_pwd_init(struct eap_sm *sm)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if ((data->bnctx = BN_CTX_new()) == NULL) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD: bn context allocation fail");
|
||||
os_free(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ((data->id_peer = os_malloc(identity_len)) == NULL) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD: memory allocation id fail");
|
||||
BN_CTX_free(data->bnctx);
|
||||
os_free(data);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -125,7 +117,6 @@ static void * eap_pwd_init(struct eap_sm *sm)
|
|||
|
||||
if ((data->password = os_malloc(password_len)) == NULL) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD: memory allocation psk fail");
|
||||
BN_CTX_free(data->bnctx);
|
||||
bin_clear_free(data->id_peer, data->id_peer_len);
|
||||
os_free(data);
|
||||
return NULL;
|
||||
|
|
@ -152,21 +143,18 @@ static void eap_pwd_deinit(struct eap_sm *sm, void *priv)
|
|||
{
|
||||
struct eap_pwd_data *data = priv;
|
||||
|
||||
BN_clear_free(data->private_value);
|
||||
BN_clear_free(data->server_scalar);
|
||||
BN_clear_free(data->my_scalar);
|
||||
BN_clear_free(data->k);
|
||||
BN_CTX_free(data->bnctx);
|
||||
EC_POINT_clear_free(data->my_element);
|
||||
EC_POINT_clear_free(data->server_element);
|
||||
crypto_bignum_deinit(data->private_value, 1);
|
||||
crypto_bignum_deinit(data->server_scalar, 1);
|
||||
crypto_bignum_deinit(data->my_scalar, 1);
|
||||
crypto_bignum_deinit(data->k, 1);
|
||||
crypto_ec_point_deinit(data->my_element, 1);
|
||||
crypto_ec_point_deinit(data->server_element, 1);
|
||||
bin_clear_free(data->id_peer, data->id_peer_len);
|
||||
bin_clear_free(data->id_server, data->id_server_len);
|
||||
bin_clear_free(data->password, data->password_len);
|
||||
if (data->grp) {
|
||||
EC_GROUP_free(data->grp->group);
|
||||
EC_POINT_clear_free(data->grp->pwe);
|
||||
BN_clear_free(data->grp->order);
|
||||
BN_clear_free(data->grp->prime);
|
||||
crypto_ec_deinit(data->grp->group);
|
||||
crypto_ec_point_deinit(data->grp->pwe, 1);
|
||||
os_free(data->grp);
|
||||
}
|
||||
wpabuf_free(data->inbuf);
|
||||
|
|
@ -331,7 +319,7 @@ eap_pwd_perform_id_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
}
|
||||
|
||||
wpa_printf(MSG_DEBUG, "EAP-PWD (peer): computed %d bit PWE...",
|
||||
BN_num_bits(data->grp->prime));
|
||||
(int) crypto_ec_prime_len_bits(data->grp->group));
|
||||
|
||||
data->outbuf = wpabuf_alloc(sizeof(struct eap_pwd_id) +
|
||||
data->id_peer_len);
|
||||
|
|
@ -356,10 +344,10 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
const struct wpabuf *reqData,
|
||||
const u8 *payload, size_t payload_len)
|
||||
{
|
||||
EC_POINT *K = NULL, *point = NULL;
|
||||
BIGNUM *mask = NULL, *x = NULL, *y = NULL, *cofactor = NULL;
|
||||
u16 offset;
|
||||
u8 *ptr, *scalar = NULL, *element = NULL;
|
||||
struct crypto_ec_point *K = NULL, *point = NULL;
|
||||
struct crypto_bignum *mask = NULL, *cofactor = NULL;
|
||||
const u8 *ptr;
|
||||
u8 *scalar = NULL, *element = NULL;
|
||||
size_t prime_len, order_len;
|
||||
|
||||
if (data->state != PWD_Commit_Req) {
|
||||
|
|
@ -367,8 +355,8 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
goto fin;
|
||||
}
|
||||
|
||||
prime_len = BN_num_bytes(data->grp->prime);
|
||||
order_len = BN_num_bytes(data->grp->order);
|
||||
prime_len = crypto_ec_prime_len(data->grp->group);
|
||||
order_len = crypto_ec_order_len(data->grp->group);
|
||||
|
||||
if (payload_len != 2 * prime_len + order_len) {
|
||||
wpa_printf(MSG_INFO,
|
||||
|
|
@ -378,87 +366,85 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
goto fin;
|
||||
}
|
||||
|
||||
if (((data->private_value = BN_new()) == NULL) ||
|
||||
((data->my_element = EC_POINT_new(data->grp->group)) == NULL) ||
|
||||
((cofactor = BN_new()) == NULL) ||
|
||||
((data->my_scalar = BN_new()) == NULL) ||
|
||||
((mask = BN_new()) == NULL)) {
|
||||
data->private_value = crypto_bignum_init();
|
||||
data->my_element = crypto_ec_point_init(data->grp->group);
|
||||
cofactor = crypto_bignum_init();
|
||||
data->my_scalar = crypto_bignum_init();
|
||||
mask = crypto_bignum_init();
|
||||
if (!data->private_value || !data->my_element || !cofactor ||
|
||||
!data->my_scalar || !mask) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): scalar allocation fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (!EC_GROUP_get_cofactor(data->grp->group, cofactor, NULL)) {
|
||||
if (crypto_ec_cofactor(data->grp->group, cofactor) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-pwd (peer): unable to get cofactor "
|
||||
"for curve");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (BN_rand_range(data->private_value, data->grp->order) != 1 ||
|
||||
BN_rand_range(mask, data->grp->order) != 1 ||
|
||||
BN_add(data->my_scalar, data->private_value, mask) != 1 ||
|
||||
BN_mod(data->my_scalar, data->my_scalar, data->grp->order,
|
||||
data->bnctx) != 1) {
|
||||
if (crypto_bignum_rand(data->private_value,
|
||||
crypto_ec_get_order(data->grp->group)) < 0 ||
|
||||
crypto_bignum_rand(mask,
|
||||
crypto_ec_get_order(data->grp->group)) < 0 ||
|
||||
crypto_bignum_add(data->private_value, mask,
|
||||
data->my_scalar) < 0 ||
|
||||
crypto_bignum_mod(data->my_scalar,
|
||||
crypto_ec_get_order(data->grp->group),
|
||||
data->my_scalar) < 0) {
|
||||
wpa_printf(MSG_INFO,
|
||||
"EAP-pwd (peer): unable to get randomness");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (!EC_POINT_mul(data->grp->group, data->my_element, NULL,
|
||||
data->grp->pwe, mask, data->bnctx)) {
|
||||
if (crypto_ec_point_mul(data->grp->group, data->grp->pwe, mask,
|
||||
data->my_element) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): element allocation "
|
||||
"fail");
|
||||
eap_pwd_state(data, FAILURE);
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (!EC_POINT_invert(data->grp->group, data->my_element, data->bnctx))
|
||||
{
|
||||
if (crypto_ec_point_invert(data->grp->group, data->my_element) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): element inversion fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (((x = BN_new()) == NULL) ||
|
||||
((y = BN_new()) == NULL)) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): point allocation fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* process the request */
|
||||
if (((data->server_scalar = BN_new()) == NULL) ||
|
||||
((data->k = BN_new()) == NULL) ||
|
||||
((K = EC_POINT_new(data->grp->group)) == NULL) ||
|
||||
((point = EC_POINT_new(data->grp->group)) == NULL) ||
|
||||
((data->server_element = EC_POINT_new(data->grp->group)) == NULL))
|
||||
{
|
||||
data->k = crypto_bignum_init();
|
||||
K = crypto_ec_point_init(data->grp->group);
|
||||
point = crypto_ec_point_init(data->grp->group);
|
||||
if (!data->k || !K || !point) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): peer data allocation "
|
||||
"fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* element, x then y, followed by scalar */
|
||||
ptr = (u8 *) payload;
|
||||
BN_bin2bn(ptr, BN_num_bytes(data->grp->prime), x);
|
||||
ptr += BN_num_bytes(data->grp->prime);
|
||||
BN_bin2bn(ptr, BN_num_bytes(data->grp->prime), y);
|
||||
ptr += BN_num_bytes(data->grp->prime);
|
||||
BN_bin2bn(ptr, BN_num_bytes(data->grp->order), data->server_scalar);
|
||||
if (!EC_POINT_set_affine_coordinates_GFp(data->grp->group,
|
||||
data->server_element, x, y,
|
||||
data->bnctx)) {
|
||||
ptr = payload;
|
||||
data->server_element = crypto_ec_point_from_bin(data->grp->group, ptr);
|
||||
if (!data->server_element) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): setting peer element "
|
||||
"fail");
|
||||
goto fin;
|
||||
}
|
||||
ptr += prime_len * 2;
|
||||
data->server_scalar = crypto_bignum_init_set(ptr, order_len);
|
||||
if (!data->server_scalar) {
|
||||
wpa_printf(MSG_INFO,
|
||||
"EAP-PWD (peer): setting peer scalar fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* check to ensure server's element is not in a small sub-group */
|
||||
if (BN_cmp(cofactor, BN_value_one())) {
|
||||
if (!EC_POINT_mul(data->grp->group, point, NULL,
|
||||
data->server_element, cofactor, NULL)) {
|
||||
if (!crypto_bignum_is_one(cofactor)) {
|
||||
if (crypto_ec_point_mul(data->grp->group, data->server_element,
|
||||
cofactor, point) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): cannot multiply "
|
||||
"server element by order!\n");
|
||||
goto fin;
|
||||
}
|
||||
if (EC_POINT_is_at_infinity(data->grp->group, point)) {
|
||||
if (crypto_ec_point_is_at_infinity(data->grp->group, point)) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): server element "
|
||||
"is at infinity!\n");
|
||||
goto fin;
|
||||
|
|
@ -466,21 +452,20 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
}
|
||||
|
||||
/* compute the shared key, k */
|
||||
if ((!EC_POINT_mul(data->grp->group, K, NULL, data->grp->pwe,
|
||||
data->server_scalar, data->bnctx)) ||
|
||||
(!EC_POINT_add(data->grp->group, K, K, data->server_element,
|
||||
data->bnctx)) ||
|
||||
(!EC_POINT_mul(data->grp->group, K, NULL, K, data->private_value,
|
||||
data->bnctx))) {
|
||||
if (crypto_ec_point_mul(data->grp->group, data->grp->pwe,
|
||||
data->server_scalar, K) < 0 ||
|
||||
crypto_ec_point_add(data->grp->group, K, data->server_element,
|
||||
K) < 0 ||
|
||||
crypto_ec_point_mul(data->grp->group, K, data->private_value,
|
||||
K) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): computing shared key "
|
||||
"fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* ensure that the shared key isn't in a small sub-group */
|
||||
if (BN_cmp(cofactor, BN_value_one())) {
|
||||
if (!EC_POINT_mul(data->grp->group, K, NULL, K, cofactor,
|
||||
NULL)) {
|
||||
if (!crypto_bignum_is_one(cofactor)) {
|
||||
if (crypto_ec_point_mul(data->grp->group, K, cofactor, K) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): cannot multiply "
|
||||
"shared key point by order");
|
||||
goto fin;
|
||||
|
|
@ -493,30 +478,22 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
* never going to happen it is a simple and safe check "just to be
|
||||
* sure" so let's be safe.
|
||||
*/
|
||||
if (EC_POINT_is_at_infinity(data->grp->group, K)) {
|
||||
if (crypto_ec_point_is_at_infinity(data->grp->group, K)) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): shared key point is at "
|
||||
"infinity!\n");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group, K, data->k,
|
||||
NULL, data->bnctx)) {
|
||||
if (crypto_ec_point_x(data->grp->group, K, data->k) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): unable to extract "
|
||||
"shared secret from point");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* now do the response */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group,
|
||||
data->my_element, x, y,
|
||||
data->bnctx)) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): point assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
if (((scalar = os_malloc(BN_num_bytes(data->grp->order))) == NULL) ||
|
||||
((element = os_malloc(BN_num_bytes(data->grp->prime) * 2)) ==
|
||||
NULL)) {
|
||||
scalar = os_zalloc(order_len);
|
||||
element = os_zalloc(prime_len * 2);
|
||||
if (!scalar || !element) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): data allocation fail");
|
||||
goto fin;
|
||||
}
|
||||
|
|
@ -526,36 +503,28 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
* sufficiently smaller than the prime or order might need pre-pending
|
||||
* with zeros.
|
||||
*/
|
||||
os_memset(scalar, 0, BN_num_bytes(data->grp->order));
|
||||
os_memset(element, 0, BN_num_bytes(data->grp->prime) * 2);
|
||||
offset = BN_num_bytes(data->grp->order) -
|
||||
BN_num_bytes(data->my_scalar);
|
||||
BN_bn2bin(data->my_scalar, scalar + offset);
|
||||
crypto_bignum_to_bin(data->my_scalar, scalar, order_len, order_len);
|
||||
if (crypto_ec_point_to_bin(data->grp->group, data->my_element, element,
|
||||
element + prime_len) != 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): point assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(x);
|
||||
BN_bn2bin(x, element + offset);
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(y);
|
||||
BN_bn2bin(y, element + BN_num_bytes(data->grp->prime) + offset);
|
||||
|
||||
data->outbuf = wpabuf_alloc(BN_num_bytes(data->grp->order) +
|
||||
2 * BN_num_bytes(data->grp->prime));
|
||||
data->outbuf = wpabuf_alloc(order_len + 2 * prime_len);
|
||||
if (data->outbuf == NULL)
|
||||
goto fin;
|
||||
|
||||
/* we send the element as (x,y) follwed by the scalar */
|
||||
wpabuf_put_data(data->outbuf, element,
|
||||
2 * BN_num_bytes(data->grp->prime));
|
||||
wpabuf_put_data(data->outbuf, scalar, BN_num_bytes(data->grp->order));
|
||||
wpabuf_put_data(data->outbuf, element, 2 * prime_len);
|
||||
wpabuf_put_data(data->outbuf, scalar, order_len);
|
||||
|
||||
fin:
|
||||
os_free(scalar);
|
||||
os_free(element);
|
||||
BN_clear_free(x);
|
||||
BN_clear_free(y);
|
||||
BN_clear_free(mask);
|
||||
BN_clear_free(cofactor);
|
||||
EC_POINT_clear_free(K);
|
||||
EC_POINT_clear_free(point);
|
||||
crypto_bignum_deinit(mask, 1);
|
||||
crypto_bignum_deinit(cofactor, 1);
|
||||
crypto_ec_point_deinit(K, 1);
|
||||
crypto_ec_point_deinit(point, 1);
|
||||
if (data->outbuf == NULL)
|
||||
eap_pwd_state(data, FAILURE);
|
||||
else
|
||||
|
|
@ -569,12 +538,11 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
const struct wpabuf *reqData,
|
||||
const u8 *payload, size_t payload_len)
|
||||
{
|
||||
BIGNUM *x = NULL, *y = NULL;
|
||||
struct crypto_hash *hash;
|
||||
u32 cs;
|
||||
u16 grp;
|
||||
u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr;
|
||||
int offset;
|
||||
size_t prime_len = 0, order_len = 0;
|
||||
|
||||
if (data->state != PWD_Confirm_Req) {
|
||||
ret->ignore = TRUE;
|
||||
|
|
@ -588,6 +556,9 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
goto fin;
|
||||
}
|
||||
|
||||
prime_len = crypto_ec_prime_len(data->grp->group);
|
||||
order_len = crypto_ec_order_len(data->grp->group);
|
||||
|
||||
/*
|
||||
* first build up the ciphersuite which is group | random_function |
|
||||
* prf
|
||||
|
|
@ -600,9 +571,9 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
ptr += sizeof(u8);
|
||||
*ptr = EAP_PWD_DEFAULT_PRF;
|
||||
|
||||
/* each component of the cruft will be at most as big as the prime */
|
||||
if (((cruft = os_malloc(BN_num_bytes(data->grp->prime))) == NULL) ||
|
||||
((x = BN_new()) == NULL) || ((y = BN_new()) == NULL)) {
|
||||
/* each component of the point will be at most as big as the prime */
|
||||
cruft = os_malloc(prime_len * 2);
|
||||
if (!cruft) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (server): confirm allocation "
|
||||
"fail");
|
||||
goto fin;
|
||||
|
|
@ -620,59 +591,34 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
* zero the memory each time because this is mod prime math and some
|
||||
* value may start with a few zeros and the previous one did not.
|
||||
*/
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(data->k);
|
||||
BN_bn2bin(data->k, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
crypto_bignum_to_bin(data->k, cruft, prime_len, prime_len);
|
||||
eap_pwd_h_update(hash, cruft, prime_len);
|
||||
|
||||
/* server element: x, y */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group,
|
||||
data->server_element, x, y,
|
||||
data->bnctx)) {
|
||||
if (crypto_ec_point_to_bin(data->grp->group, data->server_element,
|
||||
cruft, cruft + prime_len) != 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (server): confirm point "
|
||||
"assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(x);
|
||||
BN_bn2bin(x, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(y);
|
||||
BN_bn2bin(y, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
eap_pwd_h_update(hash, cruft, prime_len * 2);
|
||||
|
||||
/* server scalar */
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->order) -
|
||||
BN_num_bytes(data->server_scalar);
|
||||
BN_bn2bin(data->server_scalar, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->order));
|
||||
crypto_bignum_to_bin(data->server_scalar, cruft, order_len, order_len);
|
||||
eap_pwd_h_update(hash, cruft, order_len);
|
||||
|
||||
/* my element: x, y */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group,
|
||||
data->my_element, x, y,
|
||||
data->bnctx)) {
|
||||
if (crypto_ec_point_to_bin(data->grp->group, data->my_element, cruft,
|
||||
cruft + prime_len) != 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (server): confirm point "
|
||||
"assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(x);
|
||||
BN_bn2bin(x, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(y);
|
||||
BN_bn2bin(y, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
eap_pwd_h_update(hash, cruft, prime_len * 2);
|
||||
|
||||
/* my scalar */
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->order) -
|
||||
BN_num_bytes(data->my_scalar);
|
||||
BN_bn2bin(data->my_scalar, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->order));
|
||||
crypto_bignum_to_bin(data->my_scalar, cruft, order_len, order_len);
|
||||
eap_pwd_h_update(hash, cruft, order_len);
|
||||
|
||||
/* the ciphersuite */
|
||||
eap_pwd_h_update(hash, (u8 *) &cs, sizeof(u32));
|
||||
|
|
@ -698,58 +644,34 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
goto fin;
|
||||
|
||||
/* k */
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(data->k);
|
||||
BN_bn2bin(data->k, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
crypto_bignum_to_bin(data->k, cruft, prime_len, prime_len);
|
||||
eap_pwd_h_update(hash, cruft, prime_len);
|
||||
|
||||
/* my element */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group,
|
||||
data->my_element, x, y,
|
||||
data->bnctx)) {
|
||||
if (crypto_ec_point_to_bin(data->grp->group, data->my_element, cruft,
|
||||
cruft + prime_len) != 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): confirm point "
|
||||
"assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(x);
|
||||
BN_bn2bin(x, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(y);
|
||||
BN_bn2bin(y, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
eap_pwd_h_update(hash, cruft, prime_len * 2);
|
||||
|
||||
/* my scalar */
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->order) -
|
||||
BN_num_bytes(data->my_scalar);
|
||||
BN_bn2bin(data->my_scalar, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->order));
|
||||
crypto_bignum_to_bin(data->my_scalar, cruft, order_len, order_len);
|
||||
eap_pwd_h_update(hash, cruft, order_len);
|
||||
|
||||
/* server element: x, y */
|
||||
if (!EC_POINT_get_affine_coordinates_GFp(data->grp->group,
|
||||
data->server_element, x, y,
|
||||
data->bnctx)) {
|
||||
if (crypto_ec_point_to_bin(data->grp->group, data->server_element,
|
||||
cruft, cruft + prime_len) != 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): confirm point "
|
||||
"assignment fail");
|
||||
goto fin;
|
||||
}
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(x);
|
||||
BN_bn2bin(x, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->prime) - BN_num_bytes(y);
|
||||
BN_bn2bin(y, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->prime));
|
||||
eap_pwd_h_update(hash, cruft, prime_len * 2);
|
||||
|
||||
/* server scalar */
|
||||
os_memset(cruft, 0, BN_num_bytes(data->grp->prime));
|
||||
offset = BN_num_bytes(data->grp->order) -
|
||||
BN_num_bytes(data->server_scalar);
|
||||
BN_bn2bin(data->server_scalar, cruft + offset);
|
||||
eap_pwd_h_update(hash, cruft, BN_num_bytes(data->grp->order));
|
||||
crypto_bignum_to_bin(data->server_scalar, cruft, order_len, order_len);
|
||||
eap_pwd_h_update(hash, cruft, order_len);
|
||||
|
||||
/* the ciphersuite */
|
||||
eap_pwd_h_update(hash, (u8 *) &cs, sizeof(u32));
|
||||
|
|
@ -757,7 +679,7 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
/* all done */
|
||||
eap_pwd_h_final(hash, conf);
|
||||
|
||||
if (compute_keys(data->grp, data->bnctx, data->k,
|
||||
if (compute_keys(data->grp, data->k,
|
||||
data->my_scalar, data->server_scalar, conf, ptr,
|
||||
&cs, data->msk, data->emsk, data->session_id) < 0) {
|
||||
wpa_printf(MSG_INFO, "EAP-PWD (peer): unable to compute MSK | "
|
||||
|
|
@ -772,10 +694,7 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
|||
wpabuf_put_data(data->outbuf, conf, SHA256_MAC_LEN);
|
||||
|
||||
fin:
|
||||
if (data->grp)
|
||||
bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
|
||||
BN_clear_free(x);
|
||||
BN_clear_free(y);
|
||||
bin_clear_free(cruft, prime_len * 2);
|
||||
if (data->outbuf == NULL) {
|
||||
ret->methodState = METHOD_DONE;
|
||||
ret->decision = DECISION_FAIL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue