ported parts of two-sim branch
eap_identity parameter to exchange in eap_identity some auth_info/peer_cfg refactorings fixed some bugs, introduced new ones
This commit is contained in:
Martin Willi
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2007-2008 Tobias Brunner
|
||||
* Copyright (C) 2005-2007 Martin Willi
|
||||
* Copyright (C) 2005-2008 Martin Willi
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
@@ -37,12 +37,6 @@ ENUM(unique_policy_names, UNIQUE_NO, UNIQUE_KEEP,
|
||||
"UNIQUE_KEEP",
|
||||
);
|
||||
|
||||
ENUM(config_auth_method_names, CONF_AUTH_PUBKEY, CONF_AUTH_EAP,
|
||||
"PUBKEY",
|
||||
"PSK",
|
||||
"EAP",
|
||||
);
|
||||
|
||||
typedef struct private_peer_cfg_t private_peer_cfg_t;
|
||||
|
||||
/**
|
||||
@@ -105,21 +99,6 @@ struct private_peer_cfg_t {
|
||||
*/
|
||||
unique_policy_t unique;
|
||||
|
||||
/**
|
||||
* Method to use for own authentication data
|
||||
*/
|
||||
config_auth_method_t auth_method;
|
||||
|
||||
/**
|
||||
* EAP type to use for peer authentication
|
||||
*/
|
||||
eap_type_t eap_type;
|
||||
|
||||
/**
|
||||
* EAP vendor ID if vendor specific type is used
|
||||
*/
|
||||
u_int32_t eap_vendor;
|
||||
|
||||
/**
|
||||
* number of tries after giving up if peer does not respond
|
||||
*/
|
||||
@@ -318,23 +297,6 @@ static unique_policy_t get_unique_policy(private_peer_cfg_t *this)
|
||||
return this->unique;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of peer_cfg_t.get_auth_method.
|
||||
*/
|
||||
static config_auth_method_t get_auth_method(private_peer_cfg_t *this)
|
||||
{
|
||||
return this->auth_method;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of peer_cfg_t.get_eap_type.
|
||||
*/
|
||||
static eap_type_t get_eap_type(private_peer_cfg_t *this, u_int32_t *vendor)
|
||||
{
|
||||
*vendor = this->eap_vendor;
|
||||
return this->eap_type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of peer_cfg_t.get_keyingtries.
|
||||
*/
|
||||
@@ -469,9 +431,6 @@ static bool equals(private_peer_cfg_t *this, private_peer_cfg_t *other)
|
||||
this->other_id->equals(this->other_id, other->other_id) &&
|
||||
this->cert_policy == other->cert_policy &&
|
||||
this->unique == other->unique &&
|
||||
this->auth_method == other->auth_method &&
|
||||
this->eap_type == other->eap_type &&
|
||||
this->eap_vendor == other->eap_vendor &&
|
||||
this->keyingtries == other->keyingtries &&
|
||||
this->use_mobike == other->use_mobike &&
|
||||
this->rekey_time == other->rekey_time &&
|
||||
@@ -533,8 +492,6 @@ static void destroy(private_peer_cfg_t *this)
|
||||
peer_cfg_t *peer_cfg_create(char *name, u_int ike_version, ike_cfg_t *ike_cfg,
|
||||
identification_t *my_id, identification_t *other_id,
|
||||
cert_policy_t cert_policy, unique_policy_t unique,
|
||||
config_auth_method_t auth_method, eap_type_t eap_type,
|
||||
u_int32_t eap_vendor,
|
||||
u_int32_t keyingtries, u_int32_t rekey_time,
|
||||
u_int32_t reauth_time, u_int32_t jitter_time,
|
||||
u_int32_t over_time, bool mobike, u_int32_t dpd,
|
||||
@@ -556,8 +513,6 @@ peer_cfg_t *peer_cfg_create(char *name, u_int ike_version, ike_cfg_t *ike_cfg,
|
||||
this->public.get_other_id = (identification_t* (*)(peer_cfg_t *))get_other_id;
|
||||
this->public.get_cert_policy = (cert_policy_t (*) (peer_cfg_t *))get_cert_policy;
|
||||
this->public.get_unique_policy = (unique_policy_t (*) (peer_cfg_t *))get_unique_policy;
|
||||
this->public.get_auth_method = (config_auth_method_t (*) (peer_cfg_t *))get_auth_method;
|
||||
this->public.get_eap_type = (eap_type_t (*) (peer_cfg_t *,u_int32_t*))get_eap_type;
|
||||
this->public.get_keyingtries = (u_int32_t (*) (peer_cfg_t *))get_keyingtries;
|
||||
this->public.get_rekey_time = (u_int32_t(*)(peer_cfg_t*))get_rekey_time;
|
||||
this->public.get_reauth_time = (u_int32_t(*)(peer_cfg_t*))get_reauth_time;
|
||||
@@ -586,9 +541,6 @@ peer_cfg_t *peer_cfg_create(char *name, u_int ike_version, ike_cfg_t *ike_cfg,
|
||||
this->other_id = other_id;
|
||||
this->cert_policy = cert_policy;
|
||||
this->unique = unique;
|
||||
this->auth_method = auth_method;
|
||||
this->eap_type = eap_type;
|
||||
this->eap_vendor = eap_vendor;
|
||||
this->keyingtries = keyingtries;
|
||||
this->rekey_time = rekey_time;
|
||||
this->reauth_time = reauth_time;
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
typedef enum cert_policy_t cert_policy_t;
|
||||
typedef enum unique_policy_t unique_policy_t;
|
||||
typedef enum config_auth_method_t config_auth_method_t;
|
||||
typedef struct peer_cfg_t peer_cfg_t;
|
||||
|
||||
#include <library.h>
|
||||
@@ -81,23 +80,6 @@ enum unique_policy_t {
|
||||
*/
|
||||
extern enum_name_t *unique_policy_names;
|
||||
|
||||
/**
|
||||
* Authentication method for this IKE_SA.
|
||||
*/
|
||||
enum config_auth_method_t {
|
||||
/** authentication using public keys (RSA, ECDSA) */
|
||||
CONF_AUTH_PUBKEY = 1,
|
||||
/** authentication using a pre-shared secret */
|
||||
CONF_AUTH_PSK = 2,
|
||||
/** authentication using EAP */
|
||||
CONF_AUTH_EAP = 3,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum strings for config_auth_method_t
|
||||
*/
|
||||
extern enum_name_t *config_auth_method_names;
|
||||
|
||||
/**
|
||||
* Configuration of a peer, specified by IDs.
|
||||
*
|
||||
@@ -220,25 +202,6 @@ struct peer_cfg_t {
|
||||
* @return unique policy
|
||||
*/
|
||||
unique_policy_t (*get_unique_policy) (peer_cfg_t *this);
|
||||
|
||||
/**
|
||||
* Get the authentication method to use to authenticate us.
|
||||
*
|
||||
* @return authentication method
|
||||
*/
|
||||
config_auth_method_t (*get_auth_method) (peer_cfg_t *this);
|
||||
|
||||
/**
|
||||
* Get the EAP type to use for peer authentication.
|
||||
*
|
||||
* If vendor specific types are used, a vendor ID != 0 is returned to
|
||||
* to vendor argument. Then the returned type is specific for that
|
||||
* vendor ID.
|
||||
*
|
||||
* @param vendor receives vendor specifier, 0 for predefined EAP types
|
||||
* @return authentication method
|
||||
*/
|
||||
eap_type_t (*get_eap_type) (peer_cfg_t *this, u_int32_t *vendor);
|
||||
|
||||
/**
|
||||
* Get the max number of retries after timeout.
|
||||
@@ -372,9 +335,6 @@ struct peer_cfg_t {
|
||||
* @param other_id identification_t for the remote guy
|
||||
* @param cert_policy should we send a certificate payload?
|
||||
* @param unique uniqueness of an IKE_SA
|
||||
* @param auth_method auth method to use to authenticate us
|
||||
* @param eap_type EAP type to use for peer authentication
|
||||
* @param eap_vendor EAP vendor identifier, if vendor specific type is used
|
||||
* @param keyingtries how many keying tries should be done before giving up
|
||||
* @param rekey_time timeout before starting rekeying
|
||||
* @param reauth_time timeout before starting reauthentication
|
||||
@@ -393,8 +353,6 @@ struct peer_cfg_t {
|
||||
peer_cfg_t *peer_cfg_create(char *name, u_int ikev_version, ike_cfg_t *ike_cfg,
|
||||
identification_t *my_id, identification_t *other_id,
|
||||
cert_policy_t cert_policy, unique_policy_t unique,
|
||||
config_auth_method_t auth_method, eap_type_t eap_type,
|
||||
u_int32_t eap_vendor,
|
||||
u_int32_t keyingtries, u_int32_t rekey_time,
|
||||
u_int32_t reauth_time, u_int32_t jitter_time,
|
||||
u_int32_t over_time, bool mobike, u_int32_t dpd,
|
||||
|
||||
Reference in New Issue
Block a user