denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use message instead of attributes in hook

Browse Source
This commit is contained in:
Martin Willi
2010-02-26 11:44:34 +01:00
committed by Martin Willi
parent b3b74e479b
commit ed5fc4cafe
4 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/authenticators/eap/sim_manager.c
+5 -12
View File
@@ -450,27 +450,20 @@ static void remove_hooks(private_sim_manager_t *this, sim_hooks_t *hooks)
}
/**
* Implementation of sim_manager_t.attribute_hook
* Implementation of sim_manager_t.message_hook
*/
static bool attribute_hook(private_sim_manager_t *this, eap_code_t code,
eap_type_t type, u_int8_t subtype,
u_int8_t attribute, chunk_t data)
static void message_hook(private_sim_manager_t *this,
simaka_message_t *message, bool inbound, bool decrypted)
{
enumerator_t *enumerator;
sim_hooks_t *hooks;
bool filter = FALSE;
enumerator = this->hooks->create_enumerator(this->hooks);
while (enumerator->enumerate(enumerator, &hooks))
{
if (hooks->attribute(hooks, code, type, subtype, attribute, data))
{
filter = TRUE;
break;
}
hooks->message(hooks, message, inbound, decrypted);
}
enumerator->destroy(enumerator);
return filter;
}
/**
@@ -528,7 +521,7 @@ sim_manager_t *sim_manager_create()
this->public.provider_gen_reauth = (identification_t*(*)(sim_manager_t*, identification_t *id, char mk[HASH_SIZE_SHA1]))provider_gen_reauth;
this->public.add_hooks = (void(*)(sim_manager_t*, sim_hooks_t *hooks))add_hooks;
this->public.remove_hooks = (void(*)(sim_manager_t*, sim_hooks_t *hooks))remove_hooks;
this->public.attribute_hook = (bool(*)(sim_manager_t*, eap_code_t code, eap_type_t type, u_int8_t subtype, u_int8_t attribute, chunk_t data))attribute_hook;
this->public.message_hook = (void(*)(sim_manager_t*, simaka_message_t *message, bool inbound, bool decrypted))message_hook;
this->public.key_hook = (void(*)(sim_manager_t*, chunk_t k_encr, chunk_t k_auth))key_hook;
this->public.destroy = (void(*)(sim_manager_t*))destroy;
src/charon/sa/authenticators/eap/sim_manager.h
+18 -19
View File
@@ -31,6 +31,9 @@ typedef struct sim_card_t sim_card_t;
typedef struct sim_provider_t sim_provider_t;
typedef struct sim_hooks_t sim_hooks_t;
/** implemented in libsimaka, but we need it for the message hook */
typedef struct simaka_message_t simaka_message_t;
#define SIM_RAND_LEN 16
#define SIM_SRES_LEN 4
#define SIM_KC_LEN 8
@@ -245,17 +248,17 @@ struct sim_provider_t {
struct sim_hooks_t {
/**
* SIM/AKA attribute parsing hook.
* SIM/AKA message parsing.
*
* @param code code of EAP message the attribute was parsed from
* @param type EAP method, SIM or AKA
* @param subtye method specific subtype
* @param attribute parsed SIM/AKA attribute type
* @param data attribute data
* @return TRUE to filter out attribute from further processing
* As a SIM/AKA optionally contains encrypted attributes, the hook
* might get invoked twice, once before and once after decryption.
*
* @param message SIM/AKA message
* @param inbound TRUE for incoming messages, FALSE for outgoing
* @param decrypted TRUE if AT_ENCR_DATA has been decrypted
*/
bool (*attribute)(sim_hooks_t *this, eap_code_t code, eap_type_t type,
u_int8_t subtype, u_int8_t attribute, chunk_t data);
void (*message)(sim_hooks_t *this, simaka_message_t *message,
bool inbound, bool decrypted);
/**
* SIM/AKA encryption/authentication key hooks.
@@ -478,18 +481,14 @@ struct sim_manager_t {
void (*remove_hooks)(sim_manager_t *this, sim_hooks_t *hooks);
/**
* Invoke SIM/AKA attribute hook.
* Invoke SIM/AKA message hook.
*
* @param code EAP message code (Request/response/success/failed)
* @param type EAP method type, EAP-SIM or AKA
* @param subtype method specific message subtype
* @param attribute SIM/AKA attribute type
* @param data attribute data
* @return TRUE to filter out attribute from further processing
* @param message SIM message
* @param inbound TRUE for incoming messages, FALSE for outgoing
* @param decrypted TRUE if AT_ENCR_DATA has been decrypted
*/
bool (*attribute_hook)(sim_manager_t *this, eap_code_t code,
eap_type_t type, u_int8_t subtype,
u_int8_t attribute, chunk_t data);
void (*message_hook)(sim_manager_t *this, simaka_message_t *message,
bool inbound, bool decrypted);
/**
* Invoke SIM/AKA key hook.