Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-06 20:24:06 -05:00
Code Issues Projects Releases Wiki Activity

EAP server: Add eap_get_serial_num()

Browse Source 
This can be used to fetch the serial number of the peer certificate
during TLS-based EAP session.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2018-10-07 16:49:26 +03:00 committed by Jouni Malinen
parent 0ec3e77a13
commit 063cbb87a6
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/eap_server/eap.h
View File

@ -152,6 +152,7 @@ void eap_sm_notify_cached(struct eap_sm *sm);
void eap_sm_pending_cb(struct eap_sm *sm); void eap_sm_pending_cb(struct eap_sm *sm);
int eap_sm_method_pending(struct eap_sm *sm); int eap_sm_method_pending(struct eap_sm *sm);
const u8 * eap_get_identity(struct eap_sm *sm, size_t *len); const u8 * eap_get_identity(struct eap_sm *sm, size_t *len);
const char * eap_get_serial_num(struct eap_sm *sm);
struct eap_eapol_interface * eap_get_interface(struct eap_sm *sm); struct eap_eapol_interface * eap_get_interface(struct eap_sm *sm);
void eap_server_clear_identity(struct eap_sm *sm); void eap_server_clear_identity(struct eap_sm *sm);
void eap_server_mschap_rx_callback(struct eap_sm *sm, const char *source, void eap_server_mschap_rx_callback(struct eap_sm *sm, const char *source,

1
src/eap_server/eap_i.h
View File

@ -159,6 +159,7 @@ struct eap_sm {
void *eap_method_priv; void *eap_method_priv;
u8 *identity; u8 *identity;
size_t identity_len; size_t identity_len;
char *serial_num;
/* Whether Phase 2 method should validate identity match */ /* Whether Phase 2 method should validate identity match */
int require_identity_match; int require_identity_match;
int lastId; /* Identifier used in the last EAP-Packet */ int lastId; /* Identifier used in the last EAP-Packet */

12
src/eap_server/eap_server.c
View File

@ -1920,6 +1920,7 @@ void eap_server_sm_deinit(struct eap_sm *sm)
wpabuf_free(sm->lastReqData); wpabuf_free(sm->lastReqData);
wpabuf_free(sm->eap_if.eapRespData); wpabuf_free(sm->eap_if.eapRespData);
os_free(sm->identity); os_free(sm->identity);
os_free(sm->serial_num);
os_free(sm->pac_opaque_encr_key); os_free(sm->pac_opaque_encr_key);
os_free(sm->eap_fast_a_id); os_free(sm->eap_fast_a_id);
os_free(sm->eap_fast_a_id_info); os_free(sm->eap_fast_a_id_info);
@ -1991,6 +1992,17 @@ const u8 * eap_get_identity(struct eap_sm *sm, size_t *len)
} }
/**
* eap_get_serial_num - Get the serial number of user certificate
* @sm: Pointer to EAP state machine allocated with eap_server_sm_init()
* Returns: Pointer to the serial number or %NULL if not available
*/
const char * eap_get_serial_num(struct eap_sm *sm)
{
return sm->serial_num;
}
void eap_erp_update_identity(struct eap_sm *sm, const u8 *eap, size_t len) void eap_erp_update_identity(struct eap_sm *sm, const u8 *eap, size_t len)
{ {
#ifdef CONFIG_ERP #ifdef CONFIG_ERP

5
src/eap_server/eap_server_tls_common.c
View File

@ -341,6 +341,11 @@ int eap_server_tls_phase1(struct eap_sm *sm, struct eap_ssl_data *data)
data->tls_v13 = os_strcmp(buf, "TLSv1.3") == 0; data->tls_v13 = os_strcmp(buf, "TLSv1.3") == 0;
} }
if (!sm->serial_num &&
tls_connection_established(sm->ssl_ctx, data->conn))
sm->serial_num = tls_connection_peer_serial_num(sm->ssl_ctx,
data->conn);
return 0; return 0;
} }