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

eliminated ipsec_policy.h

Browse Source
This commit is contained in:
Andreas Steffen
2009-05-26 17:19:26 +02:00
parent 0355a1320c
commit 517895bd05
27 changed files with 131 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/keys.c
+2 -3
View File
@@ -32,7 +32,6 @@
#endif
#include <freeswan.h>
#include <ipsec_policy.h>
#include "constants.h"
#include "defs.h"
@@ -183,7 +182,7 @@ get_secret(const struct connection *c, enum PrivateKeyKind kind, bool asym)
}
else if (kind == PPK_PSK
&& (c->policy & (POLICY_PSK | POLICY_XAUTH_PSK))
&& ((c->kind == CK_TEMPLATE && c->spd.that.id.kind == ID_NONE) ||
&& ((c->kind == CK_TEMPLATE && c->spd.that.id.kind == ID_ANY) ||
(c->kind == CK_INSTANCE && id_is_ipaddr(&c->spd.that.id))))
{
/* roadwarrior: replace him with 0.0.0.0 */
@@ -1428,7 +1427,7 @@ add_x509_public_key(x509cert_t *cert , time_t until
struct id id = empty_id;
gntoid(&id, gn);
if (id.kind != ID_NONE)
if (id.kind != ID_ANY)
{
pk = allocate_RSA_public_key(c);
pk->id = id;