ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Set used auth_class in PSKv1 authenticator to comply to constraints

This commit is contained in:
Martin Willi 2011-12-20 19:20:51 +01:00
parent 8573b18d22
commit 6379c679ae
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcharon/sa/authenticator.c
View File

@ -127,7 +127,7 @@ authenticator_t *authenticator_create_v1(ike_sa_t *ike_sa, bool initiator,
case AUTH_XAUTH_RESP_PSK:
return (authenticator_t*)psk_v1_authenticator_create(ike_sa,
initiator, dh, dh_value, sa_payload,
id_payload);
id_payload, FALSE);
case AUTH_RSA:
case AUTH_XAUTH_INIT_RSA:
case AUTH_XAUTH_RESP_RSA:

7
src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c
View File

@ -16,6 +16,7 @@
#include "hybrid_authenticator.h"
#include <daemon.h>
#include <sa/ikev1/authenticators/psk_v1_authenticator.h>
typedef struct private_hybrid_authenticator_t private_hybrid_authenticator_t;
@ -89,10 +90,10 @@ hybrid_authenticator_t *hybrid_authenticator_create(ike_sa_t *ike_sa,
.destroy = _destroy,
},
},
.hash = (authenticator_t*)psk_v1_authenticator_create(ike_sa, initiator,
dh, dh_value, sa_payload, id_payload, TRUE),
.sig = authenticator_create_v1(ike_sa, initiator, AUTH_RSA, dh,
dh_value, sa_payload, id_payload),
.hash = authenticator_create_v1(ike_sa, initiator, AUTH_PSK,
dh, dh_value, sa_payload, chunk_clone(id_payload)),
dh_value, sa_payload, chunk_clone(id_payload)),
);
if (!this->sig || !this->hash)
{

14
src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
View File

@ -60,6 +60,11 @@ struct private_psk_v1_authenticator_t {
* Encoded ID payload, without fixed header
*/
chunk_t id_payload;
/**
* Used for Hybrid authentication to build hash without PSK?
*/
bool hybrid;
};
METHOD(authenticator_t, build, status_t,
@ -90,6 +95,7 @@ METHOD(authenticator_t, process, status_t,
hash_payload_t *hash_payload;
keymat_v1_t *keymat;
chunk_t hash, dh;
auth_cfg_t *auth;
hash_payload = (hash_payload_t*)message->get_payload(message, HASH_V1);
if (!hash_payload)
@ -107,6 +113,11 @@ METHOD(authenticator_t, process, status_t,
if (chunk_equals(hash, hash_payload->get_hash(hash_payload)))
{
free(hash.ptr);
if (!this->hybrid)
{
auth = this->ike_sa->get_auth_cfg(this->ike_sa, FALSE);
auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PSK);
}
return SUCCESS;
}
free(hash.ptr);
@ -127,7 +138,7 @@ METHOD(authenticator_t, destroy, void,
psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh,
chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload)
chunk_t id_payload, bool hybrid)
{
private_psk_v1_authenticator_t *this;
@ -146,6 +157,7 @@ psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa,
.dh_value = dh_value,
.sa_payload = sa_payload,
.id_payload = id_payload,
.hybrid = hybrid,
);
return &this->public;

3
src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
View File

@ -46,11 +46,12 @@ struct psk_v1_authenticator_t {
* @param sa_payload generated SA payload data, without payload header
* @param id_payload encoded ID payload of peer to authenticate or verify
* without payload header (gets owned)
* @param hybrid TRUE if used for hybrid authentication without PSK
* @return PSK authenticator
*/
psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh,
chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload);
chunk_t id_payload, bool hybrid);
#endif /** PSK_V1_AUTHENTICATOR_H_ @}*/