Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fills creation date of generated SPDs

Browse Source
This commit is contained in:
vanhu 2007-02-20 09:11:03 +00:00
parent 57d8173408
commit 19df9f5fcc
2 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: isakmp_inf.c,v 1.16 2007/02/15 13:01:26 vanhu Exp $ */
/* $NetBSD: isakmp_inf.c,v 1.17 2007/02/20 09:11:03 vanhu Exp $ */
/* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
@ -1157,8 +1157,10 @@ purge_ipsec_spi(dst0, proto, spi, n)
vchar_t *buf = NULL;
struct sadb_msg *msg, *next, *end;
struct sadb_sa *sa;
struct sadb_lifetime *lt;
struct sockaddr *src, *dst;
struct ph2handle *iph2;
u_int64_t created;
size_t i;
caddr_t mhp[SADB_EXT_MAX + 1];
@ -1197,6 +1199,11 @@ purge_ipsec_spi(dst0, proto, spi, n)
}
src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]);
dst = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]);
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
if (sa->sadb_sa_state != SADB_SASTATE_MATURE
&& sa->sadb_sa_state != SADB_SASTATE_DYING) {
@ -1232,7 +1239,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
*/
iph2 = getph2bysaidx(src, dst, proto, spi[i]);
if(iph2 != NULL){
delete_spd(iph2);
delete_spd(iph2, created);
unbindph12(iph2);
remph2(iph2);
delph2(iph2);
@ -1443,7 +1450,7 @@ info_recv_initialcontact(iph1)
proto_id = pfkey2ipsecdoi_proto(msg->sadb_msg_satype);
iph2 = getph2bysaidx(src, dst, proto_id, sa->sadb_sa_spi);
if (iph2) {
delete_spd(iph2);
delete_spd(iph2, 0);
unbindph12(iph2);
remph2(iph2);
delph2(iph2);

63
crypto/dist/ipsec-tools/src/racoon/pfkey.c vendored
View File

@ -1,6 +1,6 @@
/* $NetBSD: pfkey.c,v 1.18 2006/12/10 18:46:39 manu Exp $ */
/* $NetBSD: pfkey.c,v 1.19 2007/02/20 09:11:03 vanhu Exp $ */
/* $Id: pfkey.c,v 1.18 2006/12/10 18:46:39 manu Exp $ */
/* $Id: pfkey.c,v 1.19 2007/02/20 09:11:03 vanhu Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -2209,8 +2209,10 @@ pk_recvspdupdate(mhp)
{
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
struct policyindex spidx;
struct secpolicy *sp;
u_int64_t created;
/* sanity check */
if (mhp[0] == NULL
@ -2224,6 +2226,11 @@ pk_recvspdupdate(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
#ifdef HAVE_PFKEY_POLICY_PRIORITY
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2233,6 +2240,7 @@ pk_recvspdupdate(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2241,6 +2249,7 @@ pk_recvspdupdate(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&spidx);
#endif
@ -2322,8 +2331,10 @@ pk_recvspdadd(mhp)
{
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
struct policyindex spidx;
struct secpolicy *sp;
u_int64_t created;
/* sanity check */
if (mhp[0] == NULL
@ -2337,6 +2348,11 @@ pk_recvspdadd(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
#ifdef HAVE_PFKEY_POLICY_PRIORITY
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2346,6 +2362,7 @@ pk_recvspdadd(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2354,6 +2371,7 @@ pk_recvspdadd(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&spidx);
#endif
@ -2430,8 +2448,10 @@ pk_recvspddelete(mhp)
{
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
struct policyindex spidx;
struct secpolicy *sp;
u_int64_t created;
/* sanity check */
if (mhp[0] == NULL
@ -2445,6 +2465,11 @@ pk_recvspddelete(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
#ifdef HAVE_PFKEY_POLICY_PRIORITY
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2454,6 +2479,7 @@ pk_recvspddelete(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2462,6 +2488,7 @@ pk_recvspddelete(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&spidx);
#endif
@ -2497,8 +2524,10 @@ pk_recvspdexpire(mhp)
{
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
struct policyindex spidx;
struct secpolicy *sp;
u_int64_t created;
/* sanity check */
if (mhp[0] == NULL
@ -2512,6 +2541,11 @@ pk_recvspdexpire(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
#ifdef HAVE_PFKEY_POLICY_PRIORITY
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2521,6 +2555,7 @@ pk_recvspdexpire(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2529,6 +2564,7 @@ pk_recvspdexpire(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&spidx);
#endif
@ -2579,8 +2615,10 @@ pk_recvspddump(mhp)
struct sadb_msg *msg;
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
struct policyindex spidx;
struct secpolicy *sp;
u_int64_t created;
/* sanity check */
if (mhp[0] == NULL) {
@ -2593,6 +2631,11 @@ pk_recvspddump(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
if (saddr == NULL || daddr == NULL || xpl == NULL) {
plog(LLV_ERROR, LOCATION, NULL,
@ -2608,6 +2651,7 @@ pk_recvspddump(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2616,6 +2660,7 @@ pk_recvspddump(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&spidx);
#endif
@ -2822,6 +2867,8 @@ addnewsp(mhp)
struct secpolicy *new = NULL;
struct sadb_address *saddr, *daddr;
struct sadb_x_policy *xpl;
struct sadb_lifetime *lt;
u_int64_t created;
/* sanity check */
if (mhp[SADB_EXT_ADDRESS_SRC] == NULL
@ -2835,6 +2882,16 @@ addnewsp(mhp)
saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
lt = (struct sadb_lifetime*)mhp[SADB_EXT_LIFETIME_HARD];
if(lt != NULL)
created = lt->sadb_lifetime_addtime;
else
created = 0;
#ifdef __linux__
/* bsd skips over per-socket policies because there will be no
@ -2989,6 +3046,7 @@ addnewsp(mhp)
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
xpl->sadb_x_policy_priority,
created,
&new->spidx);
#else
KEY_SETSECSPIDX(xpl->sadb_x_policy_dir,
@ -2997,6 +3055,7 @@ addnewsp(mhp)
saddr->sadb_address_prefixlen,
daddr->sadb_address_prefixlen,
saddr->sadb_address_proto,
created,
&new->spidx);
#endif