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

ikev2: Always store signature scheme in auth-cfg

Browse Source 
As we use a different rule we can always store the scheme.
This commit is contained in:
Tobias Brunner
2016-03-04 16:19:53 +01:00
parent c8a0781334
commit e37e6d6dca
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
+1 -12
View File
@@ -55,11 +55,6 @@ struct private_pubkey_authenticator_t {
* Reserved bytes of ID payload * Reserved bytes of ID payload
*/ */
char reserved[3]; char reserved[3];
/**
* Whether to store signature schemes on remote auth configs.
*/
bool store_signature_scheme;
}; };
/** /**
@@ -425,11 +420,7 @@ METHOD(authenticator_t, process, status_t,
status = SUCCESS; status = SUCCESS;
auth->merge(auth, current_auth, FALSE); auth->merge(auth, current_auth, FALSE);
auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY); auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY);
if (this->store_signature_scheme) auth->add(auth, AUTH_RULE_IKE_SIGNATURE_SCHEME, (uintptr_t)scheme);
{
auth->add(auth, AUTH_RULE_IKE_SIGNATURE_SCHEME,
(uintptr_t)scheme);
}
break; break;
} }
else else
@@ -502,8 +493,6 @@ pubkey_authenticator_t *pubkey_authenticator_create_verifier(ike_sa_t *ike_sa,
.ike_sa = ike_sa, .ike_sa = ike_sa,
.ike_sa_init = received_init, .ike_sa_init = received_init,
.nonce = sent_nonce, .nonce = sent_nonce,
.store_signature_scheme = lib->settings->get_bool(lib->settings,
"%s.signature_authentication_constraints", TRUE, lib->ns),
); );
memcpy(this->reserved, reserved, sizeof(this->reserved)); memcpy(this->reserved, reserved, sizeof(this->reserved));