diff options
| author | Jouni Malinen <j@w1.fi> | 2014-11-30 23:27:01 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2014-11-30 23:28:19 (GMT) |
| commit | a7bec9e7b2d4ef41d822aa6034370dc620e8da46 (patch) | |
| tree | c29efad5315605ea60aeaad9a961050885e55c6a /src/eap_server | |
| parent | 9429bee4cc76d768b529e0e5d80bb77f95fa3de9 (diff) | |
| download | hostap-a7bec9e7b2d4ef41d822aa6034370dc620e8da46.zip hostap-a7bec9e7b2d4ef41d822aa6034370dc620e8da46.tar.gz hostap-a7bec9e7b2d4ef41d822aa6034370dc620e8da46.tar.bz2 | |
EAP-TTLS: Add support for deriving EMSK
This extends EAP-TTLS server and peer implementations to support EMSK
derivation per RFC 5281.
Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/eap_server')
| -rw-r--r-- | src/eap_server/eap_server_ttls.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/eap_server/eap_server_ttls.c b/src/eap_server/eap_server_ttls.c index f2b0e55..7f662d9 100644 --- a/src/eap_server/eap_server_ttls.c +++ b/src/eap_server/eap_server_ttls.c @@ -1193,6 +1193,38 @@ static u8 * eap_ttls_get_session_id(struct eap_sm *sm, void *priv, size_t *len) } +static u8 * eap_ttls_get_emsk(struct eap_sm *sm, void *priv, size_t *len) +{ + struct eap_ttls_data *data = priv; + u8 *eapKeyData, *emsk; + + if (data->state != SUCCESS) + return NULL; + + eapKeyData = eap_server_tls_derive_key(sm, &data->ssl, + "ttls keying material", + EAP_TLS_KEY_LEN + EAP_EMSK_LEN); + if (eapKeyData) { + emsk = os_malloc(EAP_EMSK_LEN); + if (emsk) + os_memcpy(emsk, eapKeyData + EAP_TLS_KEY_LEN, + EAP_EMSK_LEN); + bin_clear_free(eapKeyData, EAP_TLS_KEY_LEN + EAP_EMSK_LEN); + } else + emsk = NULL; + + if (emsk) { + *len = EAP_EMSK_LEN; + wpa_hexdump(MSG_DEBUG, "EAP-TTLS: Derived EMSK", + emsk, EAP_EMSK_LEN); + } else { + wpa_printf(MSG_DEBUG, "EAP-TTLS: Failed to derive EMSK"); + } + + return emsk; +} + + int eap_server_ttls_register(void) { struct eap_method *eap; @@ -1212,6 +1244,7 @@ int eap_server_ttls_register(void) eap->getKey = eap_ttls_getKey; eap->isSuccess = eap_ttls_isSuccess; eap->getSessionId = eap_ttls_get_session_id; + eap->get_emsk = eap_ttls_get_emsk; ret = eap_server_method_register(eap); if (ret) |