6c33eed3ee
IEEE Std 802.11-2012 11.3.5.4 specifies the PMKID for SAE-derived keys as: L((commit-scalar + peer-commit-scalar) mod r, 0, 128) This is already calculated in the SAE code when the PMK is derived, but not saved anywhere. Later, when generating the PMKID for plink action frames, the definition for PMKID from 11.6.1.3 is incorrectly used. Correct this by saving the PMKID when the key is generated and use it subsequently. Signed-off-by: Bob Copeland <me@bobcopeland.com>
72 lines
2.2 KiB
C
72 lines
2.2 KiB
C
/*
|
|
* Simultaneous authentication of equals
|
|
* Copyright (c) 2012-2013, Jouni Malinen <j@w1.fi>
|
|
*
|
|
* This software may be distributed under the terms of the BSD license.
|
|
* See README for more details.
|
|
*/
|
|
|
|
#ifndef SAE_H
|
|
#define SAE_H
|
|
|
|
#define SAE_KCK_LEN 32
|
|
#define SAE_PMK_LEN 32
|
|
#define SAE_PMKID_LEN 16
|
|
#define SAE_KEYSEED_KEY_LEN 32
|
|
#define SAE_MAX_PRIME_LEN 512
|
|
#define SAE_MAX_ECC_PRIME_LEN 66
|
|
#define SAE_COMMIT_MAX_LEN (2 + 3 * SAE_MAX_PRIME_LEN)
|
|
#define SAE_CONFIRM_MAX_LEN (2 + SAE_MAX_PRIME_LEN)
|
|
|
|
/* Special value returned by sae_parse_commit() */
|
|
#define SAE_SILENTLY_DISCARD 65535
|
|
|
|
struct sae_temporary_data {
|
|
u8 kck[SAE_KCK_LEN];
|
|
struct crypto_bignum *own_commit_scalar;
|
|
struct crypto_bignum *own_commit_element_ffc;
|
|
struct crypto_ec_point *own_commit_element_ecc;
|
|
struct crypto_bignum *peer_commit_element_ffc;
|
|
struct crypto_ec_point *peer_commit_element_ecc;
|
|
struct crypto_ec_point *pwe_ecc;
|
|
struct crypto_bignum *pwe_ffc;
|
|
struct crypto_bignum *sae_rand;
|
|
struct crypto_ec *ec;
|
|
int prime_len;
|
|
const struct dh_group *dh;
|
|
const struct crypto_bignum *prime;
|
|
const struct crypto_bignum *order;
|
|
struct crypto_bignum *prime_buf;
|
|
struct crypto_bignum *order_buf;
|
|
struct wpabuf *anti_clogging_token;
|
|
};
|
|
|
|
struct sae_data {
|
|
enum { SAE_NOTHING, SAE_COMMITTED, SAE_CONFIRMED, SAE_ACCEPTED } state;
|
|
u16 send_confirm;
|
|
u8 pmk[SAE_PMK_LEN];
|
|
u8 pmkid[SAE_PMKID_LEN];
|
|
struct crypto_bignum *peer_commit_scalar;
|
|
int group;
|
|
int sync;
|
|
struct sae_temporary_data *tmp;
|
|
};
|
|
|
|
int sae_set_group(struct sae_data *sae, int group);
|
|
void sae_clear_temp_data(struct sae_data *sae);
|
|
void sae_clear_data(struct sae_data *sae);
|
|
|
|
int sae_prepare_commit(const u8 *addr1, const u8 *addr2,
|
|
const u8 *password, size_t password_len,
|
|
struct sae_data *sae);
|
|
int sae_process_commit(struct sae_data *sae);
|
|
void sae_write_commit(struct sae_data *sae, struct wpabuf *buf,
|
|
const struct wpabuf *token);
|
|
u16 sae_parse_commit(struct sae_data *sae, const u8 *data, size_t len,
|
|
const u8 **token, size_t *token_len, int *allowed_groups);
|
|
void sae_write_confirm(struct sae_data *sae, struct wpabuf *buf);
|
|
int sae_check_confirm(struct sae_data *sae, const u8 *data, size_t len);
|
|
u16 sae_group_allowed(struct sae_data *sae, int *allowed_groups, u16 group);
|
|
|
|
#endif /* SAE_H */
|