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

charon-nm: Add support for a specific remote identity

Browse Source
This commit is contained in:
Tobias Brunner
2020-02-14 11:19:49 +01:00
parent f9956ca633
commit 19e64e101d
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-nm/nm/nm_service.c
+19 -14
View File
@@ -492,14 +492,6 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
return FALSE; return FALSE;
} }
priv->creds->add_certificate(priv->creds, cert); priv->creds->add_certificate(priv->creds, cert);
x509 = (x509_t*)cert;
if (!(x509->get_flags(x509) & X509_CA))
{ /* For a gateway certificate, we use the cert subject as identity. */
gateway = cert->get_subject(cert);
gateway = gateway->clone(gateway);
DBG1(DBG_CFG, "using gateway certificate, identity '%Y'", gateway);
}
} }
else else
{ {
@@ -507,16 +499,29 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
priv->creds->load_ca_dir(priv->creds, lib->settings->get_str( priv->creds->load_ca_dir(priv->creds, lib->settings->get_str(
lib->settings, "charon-nm.ca_dir", NM_CA_DIR)); lib->settings, "charon-nm.ca_dir", NM_CA_DIR));
} }
if (!gateway)
str = nm_setting_vpn_get_data_item(vpn, "remote-identity");
if (str)
{ {
/* If the user configured a CA certificate, we use the IP/DNS gateway = identification_create_from_string((char*)str);
* of the gateway as its identity. This identity will be used for }
* certificate lookup and requires the configured IP/DNS to be else if (cert)
* included in the gateway certificate. */ {
x509 = (x509_t*)cert;
if (!(x509->get_flags(x509) & X509_CA))
{ /* for server certificates, we use the subject as identity */
gateway = cert->get_subject(cert);
gateway = gateway->clone(gateway);
}
}
if (!gateway || gateway->get_type(gateway) == ID_ANY)
{
/* if the user configured a CA certificate (or an invalid identity),
* we use the IP/hostname of the server */
gateway = identification_create_from_string(ike.remote); gateway = identification_create_from_string(ike.remote);
DBG1(DBG_CFG, "using CA certificate, gateway identity '%Y'", gateway);
loose_gateway_id = TRUE; loose_gateway_id = TRUE;
} }
DBG1(DBG_CFG, "using gateway identity '%Y'", gateway);
if (auth_class == AUTH_CLASS_EAP || if (auth_class == AUTH_CLASS_EAP ||
auth_class == AUTH_CLASS_PSK) auth_class == AUTH_CLASS_PSK)