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

keymat_v2: Add support for PPKs

Browse Source
This commit is contained in:
Tobias Brunner
2018-09-10 18:03:01 +02:00
parent 3703dff2aa
commit 3fbc95cf54
8 changed files with 161 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+4 -4
View File
@@ -460,8 +460,8 @@ static bool verify_auth(private_eap_authenticator_t *this, message_t *message,
}
other_id = this->ike_sa->get_other_id(this->ike_sa);
keymat = (keymat_v2_t*)this->ike_sa->get_keymat(this->ike_sa);
if (!keymat->get_psk_sig(keymat, TRUE, init, nonce,
this->msk, other_id, this->reserved, &auth_data))
if (!keymat->get_psk_sig(keymat, TRUE, init, nonce, this->msk, chunk_empty,
other_id, this->reserved, &auth_data))
{
return FALSE;
}
@@ -507,8 +507,8 @@ static bool build_auth(private_eap_authenticator_t *this, message_t *message,
DBG1(DBG_IKE, "authentication of '%Y' (myself) with %N",
my_id, auth_class_names, AUTH_CLASS_EAP);
if (!keymat->get_psk_sig(keymat, FALSE, init, nonce,
this->msk, my_id, this->reserved, &auth_data))
if (!keymat->get_psk_sig(keymat, FALSE, init, nonce, this->msk, chunk_empty,
my_id, this->reserved, &auth_data))
{
return FALSE;
}
src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
+4 -2
View File
@@ -74,7 +74,8 @@ METHOD(authenticator_t, build, status_t,
return NOT_FOUND;
}
if (!keymat->get_psk_sig(keymat, FALSE, this->ike_sa_init, this->nonce,
key->get_key(key), my_id, this->reserved, &auth_data))
key->get_key(key), chunk_empty, my_id,
this->reserved, &auth_data))
{
key->destroy(key);
return FAILED;
@@ -119,7 +120,8 @@ METHOD(authenticator_t, process, status_t,
keys_found++;
if (!keymat->get_psk_sig(keymat, TRUE, this->ike_sa_init, this->nonce,
key->get_key(key), other_id, this->reserved, &auth_data))
key->get_key(key), chunk_empty, other_id,
this->reserved, &auth_data))
{
continue;
}
src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
+4 -3
View File
@@ -227,8 +227,8 @@ static status_t sign_signature_auth(private_pubkey_authenticator_t *this,
return FAILED;
}
if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init,
this->nonce, id, this->reserved, &octets,
if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init, this->nonce,
chunk_empty, id, this->reserved, &octets,
schemes))
{
enumerator = array_create_enumerator(schemes);
@@ -293,7 +293,8 @@ static bool get_auth_octets_scheme(private_pubkey_authenticator_t *this,
keymat = (keymat_v2_t*)this->ike_sa->get_keymat(this->ike_sa);
if (keymat->get_auth_octets(keymat, verify, this->ike_sa_init, this->nonce,
id, this->reserved, octets, schemes) &&
chunk_empty, id, this->reserved, octets,
schemes) &&
array_remove(schemes, 0, scheme))
{
success = TRUE;