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

keymat_v2: Include optional IntAuth in signed octets

Browse Source
This commit is contained in:
Tobias Brunner
2024-08-07 16:20:18 +02:00
parent 91f09b8d25
commit e5828d26ea
8 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-tkm/src/tkm/tkm_keymat.c
+4 -4
View File
@@ -256,8 +256,8 @@ METHOD(keymat_v2_t, get_int_auth, bool,
METHOD(keymat_v2_t, get_auth_octets, bool, METHOD(keymat_v2_t, get_auth_octets, bool,
private_tkm_keymat_t *this, bool verify, chunk_t ike_sa_init, private_tkm_keymat_t *this, bool verify, chunk_t ike_sa_init,
chunk_t nonce, chunk_t ppk, identification_t *id, char reserved[3], chunk_t nonce, chunk_t int_auth, chunk_t ppk, identification_t *id,
chunk_t *octets, array_t *schemes) char reserved[3], chunk_t *octets, array_t *schemes)
{ {
sign_info_t *sign; sign_info_t *sign;
@@ -299,8 +299,8 @@ METHOD(keymat_v2_t, get_skd, pseudo_random_function_t,
METHOD(keymat_v2_t, get_psk_sig, bool, METHOD(keymat_v2_t, get_psk_sig, bool,
private_tkm_keymat_t *this, bool verify, chunk_t ike_sa_init, chunk_t nonce, private_tkm_keymat_t *this, bool verify, chunk_t ike_sa_init, chunk_t nonce,
chunk_t secret, chunk_t ppk, identification_t *id, char reserved[3], chunk_t int_auth, chunk_t secret, chunk_t ppk, identification_t *id,
chunk_t *sig) char reserved[3], chunk_t *sig)
{ {
return FALSE; return FALSE;
} }
src/conftest/hooks/pretend_auth.c
+2 -2
View File
@@ -239,8 +239,8 @@ static bool build_auth(private_pretend_auth_t *this,
} }
keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa); keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa);
if (!keymat->get_auth_octets(keymat, TRUE, this->ike_init, this->nonce, if (!keymat->get_auth_octets(keymat, TRUE, this->ike_init, this->nonce,
chunk_empty, this->id, this->reserved, chunk_empty, chunk_empty, this->id,
&octets, NULL)) this->reserved, &octets, NULL))
{ {
private->destroy(private); private->destroy(private);
return FALSE; return FALSE;
src/conftest/hooks/rebuild_auth.c
+2 -1
View File
@@ -138,7 +138,8 @@ static bool rebuild_auth(private_rebuild_auth_t *this, ike_sa_t *ike_sa,
} }
keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa); keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa);
if (!keymat->get_auth_octets(keymat, FALSE, this->ike_init, this->nonce, if (!keymat->get_auth_octets(keymat, FALSE, this->ike_init, this->nonce,
chunk_empty, id, reserved, &octets, NULL)) chunk_empty, chunk_empty, id, reserved,
&octets, NULL))
{ {
private->destroy(private); private->destroy(private);
id->destroy(id); id->destroy(id);
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+7 -6
View File
@@ -495,8 +495,8 @@ static bool verify_auth(private_eap_authenticator_t *this, message_t *message,
other_id = this->ike_sa->get_other_id(this->ike_sa); other_id = this->ike_sa->get_other_id(this->ike_sa);
keymat = (keymat_v2_t*)this->ike_sa->get_keymat(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, this->ppk, if (!keymat->get_psk_sig(keymat, TRUE, init, nonce, chunk_empty, this->msk,
other_id, this->reserved, &auth_data)) this->ppk, other_id, this->reserved, &auth_data))
{ {
return FALSE; return FALSE;
} }
@@ -541,8 +541,8 @@ static bool build_auth(private_eap_authenticator_t *this, message_t *message,
DBG1(DBG_IKE, "authentication of '%Y' (myself) with %N", DBG1(DBG_IKE, "authentication of '%Y' (myself) with %N",
my_id, auth_class_names, AUTH_CLASS_EAP); my_id, auth_class_names, AUTH_CLASS_EAP);
if (!keymat->get_psk_sig(keymat, FALSE, init, nonce, this->msk, this->ppk, if (!keymat->get_psk_sig(keymat, FALSE, init, nonce, chunk_empty, this->msk,
my_id, this->reserved, &auth_data)) this->ppk, my_id, this->reserved, &auth_data))
{ {
return FALSE; return FALSE;
} }
@@ -554,8 +554,9 @@ static bool build_auth(private_eap_authenticator_t *this, message_t *message,
if (this->no_ppk_auth) if (this->no_ppk_auth)
{ {
if (!keymat->get_psk_sig(keymat, FALSE, init, nonce, this->msk, if (!keymat->get_psk_sig(keymat, FALSE, init, nonce, chunk_empty,
chunk_empty, my_id, this->reserved, &auth_data)) this->msk, chunk_empty, my_id, this->reserved,
&auth_data))
{ {
DBG1(DBG_IKE, "failed adding NO_PPK_AUTH notify"); DBG1(DBG_IKE, "failed adding NO_PPK_AUTH notify");
return FALSE; return FALSE;
src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
+6 -6
View File
@@ -86,8 +86,8 @@ METHOD(authenticator_t, build, status_t,
return NOT_FOUND; return NOT_FOUND;
} }
if (!keymat->get_psk_sig(keymat, FALSE, this->ike_sa_init, this->nonce, if (!keymat->get_psk_sig(keymat, FALSE, this->ike_sa_init, this->nonce,
key->get_key(key), this->ppk, my_id, chunk_empty, key->get_key(key), this->ppk,
this->reserved, &auth_data)) my_id, this->reserved, &auth_data))
{ {
key->destroy(key); key->destroy(key);
return FAILED; return FAILED;
@@ -103,8 +103,8 @@ METHOD(authenticator_t, build, status_t,
if (this->no_ppk_auth) if (this->no_ppk_auth)
{ {
if (!keymat->get_psk_sig(keymat, FALSE, this->ike_sa_init, this->nonce, if (!keymat->get_psk_sig(keymat, FALSE, this->ike_sa_init, this->nonce,
key->get_key(key), chunk_empty, my_id, chunk_empty, key->get_key(key), chunk_empty,
this->reserved, &auth_data)) my_id, this->reserved, &auth_data))
{ {
DBG1(DBG_IKE, "failed adding NO_PPK_AUTH notify"); DBG1(DBG_IKE, "failed adding NO_PPK_AUTH notify");
key->destroy(key); key->destroy(key);
@@ -160,8 +160,8 @@ METHOD(authenticator_t, process, status_t,
keys_found++; keys_found++;
if (!keymat->get_psk_sig(keymat, TRUE, this->ike_sa_init, this->nonce, if (!keymat->get_psk_sig(keymat, TRUE, this->ike_sa_init, this->nonce,
key->get_key(key), this->ppk, other_id, chunk_empty, key->get_key(key), this->ppk,
this->reserved, &auth_data)) other_id, this->reserved, &auth_data))
{ {
continue; continue;
} }
src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
+6 -4
View File
@@ -325,7 +325,8 @@ static status_t sign_signature_auth(private_pubkey_authenticator_t *this,
} }
if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init, this->nonce, if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init, this->nonce,
this->ppk, id, this->reserved, &octets, schemes)) chunk_empty, this->ppk, id, this->reserved,
&octets, schemes))
{ {
enumerator = array_create_enumerator(schemes); enumerator = array_create_enumerator(schemes);
while (enumerator->enumerate(enumerator, &params)) while (enumerator->enumerate(enumerator, &params))
@@ -347,8 +348,9 @@ static status_t sign_signature_auth(private_pubkey_authenticator_t *this,
chunk_free(&octets); chunk_free(&octets);
if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init, if (keymat->get_auth_octets(keymat, FALSE, this->ike_sa_init,
this->nonce, chunk_empty, id, this->nonce, chunk_empty,
this->reserved, &octets, schemes) && chunk_empty, id, this->reserved,
&octets, schemes) &&
private->sign(private, params->scheme, params->params, private->sign(private, params->scheme, params->params,
octets, &auth_data) && octets, &auth_data) &&
build_signature_auth_data(&auth_data, params)) build_signature_auth_data(&auth_data, params))
@@ -412,7 +414,7 @@ static bool get_auth_octets_scheme(private_pubkey_authenticator_t *this,
keymat = (keymat_v2_t*)this->ike_sa->get_keymat(this->ike_sa); 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, if (keymat->get_auth_octets(keymat, verify, this->ike_sa_init, this->nonce,
ppk, id, this->reserved, octets, chunk_empty, ppk, id, this->reserved, octets,
schemes) && schemes) &&
array_remove(schemes, 0, scheme)) array_remove(schemes, 0, scheme))
{ {
src/libcharon/sa/ikev2/keymat_v2.c
+10 -9
View File
@@ -680,8 +680,8 @@ METHOD(keymat_v2_t, get_int_auth, bool,
METHOD(keymat_v2_t, get_auth_octets, bool, METHOD(keymat_v2_t, get_auth_octets, bool,
private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init, private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init,
chunk_t nonce, chunk_t ppk, identification_t *id, char reserved[3], chunk_t nonce, chunk_t int_auth, chunk_t ppk, identification_t *id,
chunk_t *octets, array_t *schemes) char reserved[3], chunk_t *octets, array_t *schemes)
{ {
chunk_t chunk, idx; chunk_t chunk, idx;
chunk_t skp_ppk = chunk_empty; chunk_t skp_ppk = chunk_empty;
@@ -712,8 +712,9 @@ METHOD(keymat_v2_t, get_auth_octets, bool,
return FALSE; return FALSE;
} }
chunk_clear(&skp_ppk); chunk_clear(&skp_ppk);
*octets = chunk_cat("ccm", ike_sa_init, nonce, chunk); *octets = chunk_cat("ccmc", ike_sa_init, nonce, chunk, int_auth);
DBG3(DBG_IKE, "octets = message + nonce + prf(Sk_px, IDx') %B", octets); DBG3(DBG_IKE, "octets = message + nonce + prf(Sk_px, IDx') + IntAuth %B",
octets);
return TRUE; return TRUE;
} }
@@ -724,9 +725,9 @@ METHOD(keymat_v2_t, get_auth_octets, bool,
#define IKEV2_KEY_PAD_LENGTH 17 #define IKEV2_KEY_PAD_LENGTH 17
METHOD(keymat_v2_t, get_psk_sig, bool, METHOD(keymat_v2_t, get_psk_sig, bool,
private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init, chunk_t nonce, private_keymat_v2_t *this, bool verify, chunk_t ike_sa_init,
chunk_t secret, chunk_t ppk, identification_t *id, char reserved[3], chunk_t nonce, chunk_t int_auth, chunk_t secret, chunk_t ppk,
chunk_t *sig) identification_t *id, char reserved[3], chunk_t *sig)
{ {
chunk_t skp_ppk = chunk_empty, key = chunk_empty, octets = chunk_empty; chunk_t skp_ppk = chunk_empty, key = chunk_empty, octets = chunk_empty;
chunk_t key_pad; chunk_t key_pad;
@@ -744,8 +745,8 @@ METHOD(keymat_v2_t, get_psk_sig, bool,
secret = skp_ppk; secret = skp_ppk;
} }
} }
if (!get_auth_octets(this, verify, ike_sa_init, nonce, ppk, id, reserved, if (!get_auth_octets(this, verify, ike_sa_init, nonce, int_auth, ppk, id,
&octets, NULL)) reserved, &octets, NULL))
{ {
goto failure; goto failure;
} }
src/libcharon/sa/ikev2/keymat_v2.h
+12 -8
View File
@@ -124,21 +124,23 @@ struct keymat_v2_t {
* the get_psk_sig() method instead. * the get_psk_sig() method instead.
* *
* @param verify TRUE to create for verification, FALSE to sign * @param verify TRUE to create for verification, FALSE to sign
* @param ike_sa_init encoded ike_sa_init message * @param ike_sa_init encoded IKE_SA_INIT message
* @param nonce nonce value * @param nonce nonce value
* @param int_auth concatenated data of IKE_INTERMEDIATE exchanges
* @param ppk optional postquantum preshared key * @param ppk optional postquantum preshared key
* @param id identity * @param id identity
* @param reserved reserved bytes of id_payload * @param reserved reserved bytes of id_payload
* @param octests chunk receiving allocated auth octets * @param octets chunk receiving allocated auth octets
* @param schemes array containing signature schemes * @param schemes array containing signature schemes
* (signature_params_t*) in case they need to be * (signature_params_t*) in case they need to be
* modified by the keymat implementation * modified by the keymat implementation
* @return TRUE if octets created successfully * @return TRUE if octets created successfully
*/ */
bool (*get_auth_octets)(keymat_v2_t *this, bool verify, chunk_t ike_sa_init, bool (*get_auth_octets)(keymat_v2_t *this, bool verify, chunk_t ike_sa_init,
chunk_t nonce, chunk_t ppk, identification_t *id, chunk_t nonce, chunk_t int_auth, chunk_t ppk,
char reserved[3], chunk_t *octets, identification_t *id, char reserved[3],
array_t *schemes); chunk_t *octets, array_t *schemes);
/** /**
* Build the shared secret signature used for PSK and EAP authentication. * Build the shared secret signature used for PSK and EAP authentication.
* *
@@ -147,8 +149,9 @@ struct keymat_v2_t {
* used as secret (used for EAP methods without MSK). * used as secret (used for EAP methods without MSK).
* *
* @param verify TRUE to create for verification, FALSE to sign * @param verify TRUE to create for verification, FALSE to sign
* @param ike_sa_init encoded ike_sa_init message * @param ike_sa_init encoded IKE_SA_INIT message
* @param nonce nonce value * @param nonce nonce value
* @param int_auth concatenated data of IKE_INTERMEDIATE exchanges
* @param secret optional secret to include into signature * @param secret optional secret to include into signature
* @param ppk optional postquantum preshared key * @param ppk optional postquantum preshared key
* @param id identity * @param id identity
@@ -157,8 +160,9 @@ struct keymat_v2_t {
* @return TRUE if signature created successfully * @return TRUE if signature created successfully
*/ */
bool (*get_psk_sig)(keymat_v2_t *this, bool verify, chunk_t ike_sa_init, bool (*get_psk_sig)(keymat_v2_t *this, bool verify, chunk_t ike_sa_init,
chunk_t nonce, chunk_t secret, chunk_t ppk, chunk_t nonce, chunk_t int_auth, chunk_t secret,
identification_t *id, char reserved[3], chunk_t *sig); chunk_t ppk, identification_t *id, char reserved[3],
chunk_t *sig);
/** /**
* Add a hash algorithm supported by the peer for signature authentication. * Add a hash algorithm supported by the peer for signature authentication.