![[BACK]](/icons/back.gif){kind=icon}
Up to [cvs.NetBSD.org] / src / crypto / dist / ipsec-tools / src / setkey
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.26 / (download) - annotate - [select for diffs], Tue May 12 16:17:58 2020 UTC (3 years, 11 months ago) by christos
Branch: MAIN
CVS Tags: netbsd-10-base,
netbsd-10-0-RELEASE,
netbsd-10-0-RC6,
netbsd-10-0-RC5,
netbsd-10-0-RC4,
netbsd-10-0-RC3,
netbsd-10-0-RC2,
netbsd-10-0-RC1,
netbsd-10,
cjep_sun2x-base1,
cjep_sun2x-base,
cjep_sun2x,
cjep_staticlib_x-base1,
cjep_staticlib_x-base,
cjep_staticlib_x,
HEAD
Changes since 1.25: +5 -2
lines
Diff to previous 1.25 (colored) to selected 1.1 (colored)
- in script mode always output errors to stderr prefixed by the program name. - in command mode always output errors to stdout not prefixed " " " - perror(3) -> warn(3)
Revision 1.25 / (download) - annotate - [select for diffs], Tue May 12 14:29:06 2020 UTC (3 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.24: +8 -8
lines
Diff to previous 1.24 (colored) to selected 1.1 (colored)
Keep track of the filename to print in error messages. Change quoting of error string from [] to `'.
Revision 1.24 / (download) - annotate - [select for diffs], Sun May 10 19:54:49 2020 UTC (3 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.23: +4 -3
lines
Diff to previous 1.23 (colored) to selected 1.1 (colored)
prefix errors with the program name and use stderr.
Revision 1.21.2.4 / (download) - annotate - [select for diffs], Tue Apr 21 19:37:55 2020 UTC (3 years, 11 months ago) by martin
Branch: phil-wifi
Changes since 1.21.2.3: +1 -1
lines
Diff to previous 1.21.2.3 (colored) to branchpoint 1.21 (colored) next main 1.22 (colored) to selected 1.1 (colored)
Ooops, restore accidently removed files from merge mishap
Revision 1.21.2.3, Tue Apr 21 18:41:30 2020 UTC (3 years, 11 months ago) by martin
Branch: phil-wifi
Changes since 1.21.2.2: +1 -1
lines
FILE REMOVED
Sync with HEAD
Revision 1.21.2.2 / (download) - annotate - [select for diffs], Mon Apr 13 07:45:08 2020 UTC (4 years ago) by martin
Branch: phil-wifi
Changes since 1.21.2.1: +2 -1
lines
Diff to previous 1.21.2.1 (colored) to branchpoint 1.21 (colored) to selected 1.1 (colored)
Mostly merge changes from HEAD upto 20200411
Revision 1.19.8.2 / (download) - annotate - [select for diffs], Thu Jul 25 08:58:21 2019 UTC (4 years, 8 months ago) by martin
Branch: netbsd-8
CVS Tags: netbsd-8-2-RELEASE
Changes since 1.19.8.1: +2 -1
lines
Diff to previous 1.19.8.1 (colored) to branchpoint 1.19 (colored) next main 1.20 (colored) to selected 1.1 (colored)
Pull up following revision(s) (requested by ozaki-r in ticket #1306): crypto/dist/ipsec-tools/src/setkey/parse.y: revision 1.23 sys/netipsec/key.c: revision 1.265 crypto/dist/ipsec-tools/src/setkey/token.l: revision 1.23 tests/net/ipsec/t_ipsec_misc.sh: revision 1.23 ipsec: fix a regression of the update API The update API updates an SA by creating a new SA and removing an existing SA. The previous change removed a newly added SA wrongly if an existing SA had been created by the getspi API. setkey: enable to use the getspi API If a specified SPI is not zero, tell the kernel to use the SPI by using SADB_EXT_SPIRANGE. Otherwise, the kernel picks a random SPI. It enables to mimic racoon. tests: add tests for getspi and udpate
Revision 1.23 / (download) - annotate - [select for diffs], Tue Jul 23 04:30:32 2019 UTC (4 years, 8 months ago) by ozaki-r
Branch: MAIN
CVS Tags: phil-wifi-20200421,
phil-wifi-20200411,
phil-wifi-20200406,
phil-wifi-20191119,
netbsd-9-base,
netbsd-9-3-RELEASE,
netbsd-9-2-RELEASE,
netbsd-9-1-RELEASE,
netbsd-9-0-RELEASE,
netbsd-9-0-RC2,
netbsd-9-0-RC1,
netbsd-9,
is-mlppp-base,
is-mlppp
Changes since 1.22: +2 -1
lines
Diff to previous 1.22 (colored) to selected 1.1 (colored)
setkey: enable to use the getspi API If a specified SPI is not zero, tell the kernel to use the SPI by using SADB_EXT_SPIRANGE. Otherwise, the kernel picks a random SPI. It enables to mimic racoon.
Revision 1.21.2.1 / (download) - annotate - [select for diffs], Mon Jun 10 21:41:09 2019 UTC (4 years, 10 months ago) by christos
Branch: phil-wifi
Changes since 1.21: +14 -15
lines
Diff to previous 1.21 (colored) to selected 1.1 (colored)
Sync with HEAD
Revision 1.20.4.2 / (download) - annotate - [select for diffs], Sat Oct 20 06:58:16 2018 UTC (5 years, 6 months ago) by pgoyette
Branch: pgoyette-compat
CVS Tags: pgoyette-compat-merge-20190127
Changes since 1.20.4.1: +14 -15
lines
Diff to previous 1.20.4.1 (colored) to branchpoint 1.20 (colored) next main 1.21 (colored) to selected 1.1 (colored)
Sync with head
Revision 1.22 / (download) - annotate - [select for diffs], Sun Oct 14 08:27:39 2018 UTC (5 years, 6 months ago) by maxv
Branch: MAIN
CVS Tags: phil-wifi-20190609,
pgoyette-compat-20190127,
pgoyette-compat-20190118,
pgoyette-compat-1226,
pgoyette-compat-1126,
pgoyette-compat-1020
Changes since 1.21: +14 -15
lines
Diff to previous 1.21 (colored) to selected 1.1 (colored)
Clean up setkey: remove dead wood, KNF, localify, and slightly improve.
Revision 1.20.4.1 / (download) - annotate - [select for diffs], Mon Jun 25 07:25:05 2018 UTC (5 years, 9 months ago) by pgoyette
Branch: pgoyette-compat
Changes since 1.20: +4 -7
lines
Diff to previous 1.20 (colored) to selected 1.1 (colored)
Sync with HEAD
Revision 1.21 / (download) - annotate - [select for diffs], Mon May 28 19:52:18 2018 UTC (5 years, 10 months ago) by maxv
Branch: MAIN
CVS Tags: phil-wifi-base,
pgoyette-compat-0930,
pgoyette-compat-0906,
pgoyette-compat-0728,
pgoyette-compat-0625
Branch point for: phil-wifi
Changes since 1.20: +4 -7
lines
Diff to previous 1.20 (colored) to selected 1.1 (colored)
fix -Wold-style-definition
Revision 1.19.8.1 / (download) - annotate - [select for diffs], Sat Oct 21 19:43:53 2017 UTC (6 years, 5 months ago) by snj
Branch: netbsd-8
CVS Tags: netbsd-8-1-RELEASE,
netbsd-8-1-RC1,
netbsd-8-0-RELEASE,
netbsd-8-0-RC2,
netbsd-8-0-RC1,
matt-nb8-mediatek-base,
matt-nb8-mediatek
Changes since 1.19: +2 -1
lines
Diff to previous 1.19 (colored) to selected 1.1 (colored)
Pull up following revision(s) (requested by ozaki-r in ticket #300): crypto/dist/ipsec-tools/src/setkey/parse.y: 1.19 crypto/dist/ipsec-tools/src/setkey/token.l: 1.20 distrib/sets/lists/tests/mi: 1.754, 1.757, 1.759 doc/TODO.smpnet: 1.12-1.13 sys/net/pfkeyv2.h: 1.32 sys/net/raw_cb.c: 1.23-1.24, 1.28 sys/net/raw_cb.h: 1.28 sys/net/raw_usrreq.c: 1.57-1.58 sys/net/rtsock.c: 1.228-1.229 sys/netinet/in_proto.c: 1.125 sys/netinet/ip_input.c: 1.359-1.361 sys/netinet/tcp_input.c: 1.359-1.360 sys/netinet/tcp_output.c: 1.197 sys/netinet/tcp_var.h: 1.178 sys/netinet6/icmp6.c: 1.213 sys/netinet6/in6_proto.c: 1.119 sys/netinet6/ip6_forward.c: 1.88 sys/netinet6/ip6_input.c: 1.181-1.182 sys/netinet6/ip6_output.c: 1.193 sys/netinet6/ip6protosw.h: 1.26 sys/netipsec/ipsec.c: 1.100-1.122 sys/netipsec/ipsec.h: 1.51-1.61 sys/netipsec/ipsec6.h: 1.18-1.20 sys/netipsec/ipsec_input.c: 1.44-1.51 sys/netipsec/ipsec_netbsd.c: 1.41-1.45 sys/netipsec/ipsec_output.c: 1.49-1.64 sys/netipsec/ipsec_private.h: 1.5 sys/netipsec/key.c: 1.164-1.234 sys/netipsec/key.h: 1.20-1.32 sys/netipsec/key_debug.c: 1.18-1.21 sys/netipsec/key_debug.h: 1.9 sys/netipsec/keydb.h: 1.16-1.20 sys/netipsec/keysock.c: 1.59-1.62 sys/netipsec/keysock.h: 1.10 sys/netipsec/xform.h: 1.9-1.12 sys/netipsec/xform_ah.c: 1.55-1.74 sys/netipsec/xform_esp.c: 1.56-1.72 sys/netipsec/xform_ipcomp.c: 1.39-1.53 sys/netipsec/xform_ipip.c: 1.50-1.54 sys/netipsec/xform_tcp.c: 1.12-1.16 sys/rump/librump/rumpkern/Makefile.rumpkern: 1.170 sys/rump/librump/rumpnet/net_stub.c: 1.27 sys/sys/protosw.h: 1.67-1.68 tests/net/carp/t_basic.sh: 1.7 tests/net/if_gif/t_gif.sh: 1.11 tests/net/if_l2tp/t_l2tp.sh: 1.3 tests/net/ipsec/Makefile: 1.7-1.9 tests/net/ipsec/algorithms.sh: 1.5 tests/net/ipsec/common.sh: 1.4-1.6 tests/net/ipsec/t_ipsec_ah_keys.sh: 1.2 tests/net/ipsec/t_ipsec_esp_keys.sh: 1.2 tests/net/ipsec/t_ipsec_gif.sh: 1.6-1.7 tests/net/ipsec/t_ipsec_l2tp.sh: 1.6-1.7 tests/net/ipsec/t_ipsec_misc.sh: 1.8-1.18 tests/net/ipsec/t_ipsec_sockopt.sh: 1.1-1.2 tests/net/ipsec/t_ipsec_tcp.sh: 1.1-1.2 tests/net/ipsec/t_ipsec_transport.sh: 1.5-1.6 tests/net/ipsec/t_ipsec_tunnel.sh: 1.9 tests/net/ipsec/t_ipsec_tunnel_ipcomp.sh: 1.1-1.2 tests/net/ipsec/t_ipsec_tunnel_odd.sh: 1.3 tests/net/mcast/t_mcast.sh: 1.6 tests/net/net/t_ipaddress.sh: 1.11 tests/net/net_common.sh: 1.20 tests/net/npf/t_npf.sh: 1.3 tests/net/route/t_flags.sh: 1.20 tests/net/route/t_flags6.sh: 1.16 usr.bin/netstat/fast_ipsec.c: 1.22 Do m_pullup before mtod It may fix panicks of some tests on anita/sparc and anita/GuruPlug. --- KNF --- Enable DEBUG for babylon5 --- Apply C99-style struct initialization to xformsw --- Tweak outputs of netstat -s for IPsec - Get rid of "Fast" - Use ipsec and ipsec6 for titles to clarify protocol - Indent outputs of sub protocols Original outputs were organized like this: (Fast) IPsec: IPsec ah: IPsec esp: IPsec ipip: IPsec ipcomp: (Fast) IPsec: IPsec ah: IPsec esp: IPsec ipip: IPsec ipcomp: New outputs are organized like this: ipsec: ah: esp: ipip: ipcomp: ipsec6: ah: esp: ipip: ipcomp: --- Add test cases for IPComp --- Simplify IPSEC_OSTAT macro (NFC) --- KNF; replace leading whitespaces with hard tabs --- Introduce and use SADB_SASTATE_USABLE_P --- KNF --- Add update command for testing Updating an SA (SADB_UPDATE) requires that a process issuing SADB_UPDATE is the same as a process issued SADB_ADD (or SADB_GETSPI). This means that update command must be used with add command in a configuration of setkey. This usage is normally meaningless but useful for testing (and debugging) purposes. --- Add test cases for updating SA/SP The tests require newly-added udpate command of setkey. --- PR/52346: Frank Kardel: Fix checksumming for NAT-T See XXX for improvements. --- Remove codes for PACKET_TAG_IPSEC_IN_CRYPTO_DONE It seems that PACKET_TAG_IPSEC_IN_CRYPTO_DONE is for network adapters that have IPsec accelerators; a driver sets the mtag to a packet when its device has already encrypted the packet. Unfortunately no driver implements such offload features for long years and seems unlikely to implement them soon. (Note that neither FreeBSD nor Linux doesn't have such drivers.) Let's remove related (unused) codes and simplify the IPsec code. --- Fix usages of sadb_msg_errno --- Avoid updating sav directly On SADB_UPDATE a target sav was updated directly, which was unsafe. Instead allocate another sav, copy variables of the old sav to the new one and replace the old one with the new one. --- Simplify; we can assume sav->tdb_xform cannot be NULL while it's valid --- Rename key_alloc* functions (NFC) We shouldn't use the term "alloc" for functions that just look up data and actually don't allocate memory. --- Use explicit_memset to surely zero-clear key_auth and key_enc --- Make sure to clear keys on error paths of key_setsaval --- Add missing KEY_FREESAV --- Make sure a sav is inserted to a sah list after its initialization completes --- Remove unnecessary zero-clearing codes from key_setsaval key_setsaval is now used only for a newly-allocated sav. (It was used to reset variables of an existing sav.) --- Correct wrong assumption of sav->refcnt in key_delsah A sav in a list is basically not to be sav->refcnt == 0. And also KEY_FREESAV assumes sav->refcnt > 0. --- Let key_getsavbyspi take a reference of a returning sav --- Use time_mono_to_wall (NFC) --- Separate sending message routine (NFC) --- Simplify; remove unnecessary zero-clears key_freesaval is used only when a target sav is being destroyed. --- Omit NULL checks for sav->lft_c sav->lft_c can be NULL only when initializing or destroying sav. --- Omit unnecessary NULL checks for sav->sah --- Omit unnecessary check of sav->state key_allocsa_policy picks a sav of either MATURE or DYING so we don't need to check its state again. --- Simplify; omit unnecessary saidx passing - ipsec_nextisr returns a saidx but no caller uses it - key_checkrequest is passed a saidx but it can be gotton by another argument (isr) --- Fix splx isn't called on some error paths --- Fix header size calculation of esp where sav is NULL --- Fix header size calculation of ah in the case sav is NULL This fix was also needed for esp. --- Pass sav directly to opencrypto callback In a callback, use a passed sav as-is by default and look up a sav only if the passed sav is dead. --- Avoid examining freshness of sav on packet processing If a sav list is sorted (by lft_c->sadb_lifetime_addtime) in advance, we don't need to examine each sav and also don't need to delete one on the fly and send up a message. Fortunately every sav lists are sorted as we need. Added key_validate_savlist validates that each sav list is surely sorted (run only if DEBUG because it's not cheap). --- Add test cases for SAs with different SPIs --- Prepare to stop using isr->sav isr is a shared resource and using isr->sav as a temporal storage for each packet processing is racy. And also having a reference from isr to sav makes the lifetime of sav non-deterministic; such a reference is removed when a packet is processed and isr->sav is overwritten by new one. Let's have a sav locally for each packet processing instead of using shared isr->sav. However this change doesn't stop using isr->sav yet because there are some users of isr->sav. isr->sav will be removed after the users find a way to not use isr->sav. --- Fix wrong argument handling --- fix printf format. --- Don't validate sav lists of LARVAL or DEAD states We don't sort the lists so the validation will always fail. Fix PR kern/52405 --- Make sure to sort the list when changing the state by key_sa_chgstate --- Rename key_allocsa_policy to key_lookup_sa_bysaidx --- Separate test files --- Calculate ah_max_authsize on initialization as well as esp_max_ivlen --- Remove m_tag_find(PACKET_TAG_IPSEC_PENDING_TDB) because nobody sets the tag --- Restore a comment removed in previous The comment is valid for the below code. --- Make tests more stable sleep command seems to wait longer than expected on anita so use polling to wait for a state change. --- Add tests that explicitly delete SAs instead of waiting for expirations --- Remove invalid M_AUTHIPDGM check on ESP isr->sav M_AUTHIPDGM flag is set to a mbuf in ah_input_cb. An sav of ESP can have AH authentication as sav->tdb_authalgxform. However, in that case esp_input and esp_input_cb are used to do ESP decryption and AH authentication and M_AUTHIPDGM never be set to a mbuf. So checking M_AUTHIPDGM of a mbuf on isr->sav of ESP is meaningless. --- Look up sav instead of relying on unstable sp->req->sav This code is executed only in an error path so an additional lookup doesn't matter. --- Correct a comment --- Don't release sav if calling crypto_dispatch again --- Remove extra KEY_FREESAV from ipsec_process_done It should be done by the caller. --- Don't bother the case of crp->crp_buf == NULL in callbacks --- Hold a reference to an SP during opencrypto processing An SP has a list of isr (ipsecrequest) that represents a sequence of IPsec encryption/authentication processing. One isr corresponds to one opencrypto processing. The lifetime of an isr follows its SP. We pass an isr to a callback function of opencrypto to continue to a next encryption/authentication processing. However nobody guaranteed that the isr wasn't freed, i.e., its SP wasn't destroyed. In order to avoid such unexpected destruction of isr, hold a reference to its SP during opencrypto processing. --- Don't make SAs expired on tests that delete SAs explicitly --- Fix a debug message --- Dedup error paths (NFC) --- Use pool to allocate tdb_crypto For ESP and AH, we need to allocate an extra variable space in addition to struct tdb_crypto. The fixed size of pool items may be larger than an actual requisite size of a buffer, but still the performance improvement by replacing malloc with pool wins. --- Don't use unstable isr->sav for header size calculations We may need to optimize to not look up sav here for users that don't need to know an exact size of headers (e.g., TCP segmemt size caclulation). --- Don't use sp->req->sav when handling NAT-T ESP fragmentation In order to do this we need to look up a sav however an additional look-up degrades performance. A sav is later looked up in ipsec4_process_packet so delay the fragmentation check until then to avoid an extra look-up. --- Don't use key_lookup_sp that depends on unstable sp->req->sav It provided a fast look-up of SP. We will provide an alternative method in the future (after basic MP-ification finishes). --- Stop setting isr->sav on looking up sav in key_checkrequest --- Remove ipsecrequest#sav --- Stop setting mtag of PACKET_TAG_IPSEC_IN_DONE because there is no users anymore --- Skip ipsec_spi_*_*_preferred_new_timeout when running on qemu Probably due to PR 43997 --- Add localcount to rump kernels --- Remove unused macro --- Fix key_getcomb_setlifetime The fix adjusts a soft limit to be 80% of a corresponding hard limit. I'm not sure the fix is really correct though, at least the original code is wrong. A passed comb is zero-cleared before calling key_getcomb_setlifetime, so comb->sadb_comb_soft_addtime = comb->sadb_comb_soft_addtime * 80 / 100; is meaningless. --- Provide and apply key_sp_refcnt (NFC) It simplifies further changes. --- Fix indentation Pointed out by knakahara@ --- Use pslist(9) for sptree --- Don't acquire global locks for IPsec if NET_MPSAFE Note that the change is just to make testing easy and IPsec isn't MP-safe yet. --- Let PF_KEY socks hold their own lock instead of softnet_lock Operations on SAD and SPD are executed via PF_KEY socks. The operations include deletions of SAs and SPs that will use synchronization mechanisms such as pserialize_perform to wait for references to SAs and SPs to be released. It is known that using such mechanisms with holding softnet_lock causes a dead lock. We should avoid the situation. --- Make IPsec SPD MP-safe We use localcount(9), not psref(9), to make the sptree and secpolicy (SP) entries MP-safe because SPs need to be referenced over opencrypto processing that executes a callback in a different context. SPs on sockets aren't managed by the sptree and can be destroyed in softint. localcount_drain cannot be used in softint so we delay the destruction of such SPs to a thread context. To do so, a list to manage such SPs is added (key_socksplist) and key_timehandler_spd deletes dead SPs in the list. For more details please read the locking notes in key.c. Proposed on tech-kern@ and tech-net@ --- Fix updating ipsec_used - key_update_used wasn't called in key_api_spddelete2 and key_api_spdflush - key_update_used wasn't called if an SP had been added/deleted but a reply to userland failed --- Fix updating ipsec_used; turn on when SPs on sockets are added --- Add missing IPsec policy checks to icmp6_rip6_input icmp6_rip6_input is quite similar to rip6_input and the same checks exist in rip6_input. --- Add test cases for setsockopt(IP_IPSEC_POLICY) --- Don't use KEY_NEWSP for dummy SP entries By the change KEY_NEWSP is now not called from softint anymore and we can use kmem_zalloc with KM_SLEEP for KEY_NEWSP. --- Comment out unused functions --- Add test cases that there are SPs but no relevant SAs --- Don't allow sav->lft_c to be NULL lft_c of an sav that was created by SADB_GETSPI could be NULL. --- Clean up clunky eval strings - Remove unnecessary \ at EOL - This allows to omit ; too - Remove unnecessary quotes for arguments of atf_set - Don't expand $DEBUG in eval - We expect it's expanded on execution Suggested by kre@ --- Remove unnecessary KEY_FREESAV in an error path sav should be freed (unreferenced) by the caller. --- Use pslist(9) for sahtree --- Use pslist(9) for sah->savtree --- Rename local variable newsah to sah It may not be new. --- MP-ify SAD slightly - Introduce key_sa_mtx and use it for some list operations - Use pserialize for some list iterations --- Introduce KEY_SA_UNREF and replace KEY_FREESAV with it where sav will never be actually freed in the future KEY_SA_UNREF is still key_freesav so no functional change for now. This change reduces diff of further changes. --- Remove out-of-date log output Pointed out by riastradh@ --- Use KDASSERT instead of KASSERT for mutex_ownable Because mutex_ownable is too heavy to run in a fast path even for DIAGNOSTIC + LOCKDEBUG. Suggested by riastradh@ --- Assemble global lists and related locks into cache lines (NFCI) Also rename variable names from *tree to *list because they are just lists, not trees. Suggested by riastradh@ --- Move locking notes --- Update the locking notes - Add locking order - Add locking notes for misc lists such as reglist - Mention pserialize, key_sp_ref and key_sp_unref on SP operations Requested by riastradh@ --- Describe constraints of key_sp_ref and key_sp_unref Requested by riastradh@ --- Hold key_sad.lock on SAVLIST_WRITER_INSERT_TAIL --- Add __read_mostly to key_psz Suggested by riastradh@ --- Tweak wording (pserialize critical section => pserialize read section) Suggested by riastradh@ --- Add missing mutex_exit --- Fix setkey -D -P outputs The outputs were tweaked (by me), but I forgot updating libipsec in my local ATF environment... --- MP-ify SAD (key_sad.sahlist and sah entries) localcount(9) is used to protect key_sad.sahlist and sah entries as well as SPD (and will be used for SAD sav). Please read the locking notes of SAD for more details. --- Introduce key_sa_refcnt and replace sav->refcnt with it (NFC) --- Destroy sav only in the loop for DEAD sav --- Fix KASSERT(solocked(sb->sb_so)) failure in sbappendaddr that is called eventually from key_sendup_mbuf If key_sendup_mbuf isn't passed a socket, the assertion fails. Originally in this case sb->sb_so was softnet_lock and callers held softnet_lock so the assertion was magically satisfied. Now sb->sb_so is key_so_mtx and also softnet_lock isn't always held by callers so the assertion can fail. Fix it by holding key_so_mtx if key_sendup_mbuf isn't passed a socket. Reported by knakahara@ Tested by knakahara@ and ozaki-r@ --- Fix locking notes of SAD --- Fix deadlock between key_sendup_mbuf called from key_acquire and localcount_drain If we call key_sendup_mbuf from key_acquire that is called on packet processing, a deadlock can happen like this: - At key_acquire, a reference to an SP (and an SA) is held - key_sendup_mbuf will try to take key_so_mtx - Some other thread may try to localcount_drain to the SP with holding key_so_mtx in say key_api_spdflush - In this case localcount_drain never return because key_sendup_mbuf that has stuck on key_so_mtx never release a reference to the SP Fix the deadlock by deferring key_sendup_mbuf to the timer (key_timehandler). --- Fix that prev isn't cleared on retry --- Limit the number of mbufs queued for deferred key_sendup_mbuf It's easy to be queued hundreds of mbufs on the list under heavy network load. --- MP-ify SAD (savlist) localcount(9) is used to protect savlist of sah. The basic design is similar to MP-ifications of SPD and SAD sahlist. Please read the locking notes of SAD for more details. --- Simplify ipsec_reinject_ipstack (NFC) --- Add per-CPU rtcache to ipsec_reinject_ipstack It reduces route lookups and also reduces rtcache lock contentions when NET_MPSAFE is enabled. --- Use pool_cache(9) instead of pool(9) for tdb_crypto objects The change improves network throughput especially on multi-core systems. --- Update ipsec(4), opencrypto(9) and vlan(4) are now MP-safe. --- Write known issues on scalability --- Share a global dummy SP between PCBs It's never be changed so it can be pre-allocated and shared safely between PCBs. --- Fix race condition on the rawcb list shared by rtsock and keysock keysock now protects itself by its own mutex, which means that the rawcb list is protected by two different mutexes (keysock's one and softnet_lock for rtsock), of course it's useless. Fix the situation by having a discrete rawcb list for each. --- Use a dedicated mutex for rt_rawcb instead of softnet_lock if NET_MPSAFE --- fix localcount leak in sav. fixed by ozaki-r@n.o. I commit on behalf of him. --- remove unnecessary comment. --- Fix deadlock between pserialize_perform and localcount_drain A typical ussage of localcount_drain looks like this: mutex_enter(&mtx); item = remove_from_list(); pserialize_perform(psz); localcount_drain(&item->localcount, &cv, &mtx); mutex_exit(&mtx); This sequence can cause a deadlock which happens for example on the following situation: - Thread A calls localcount_drain which calls xc_broadcast after releasing a specified mutex - Thread B enters the sequence and calls pserialize_perform with holding the mutex while pserialize_perform also calls xc_broadcast - Thread C (xc_thread) that calls an xcall callback of localcount_drain tries to hold the mutex xc_broadcast of thread B doesn't start until xc_broadcast of thread A finishes, which is a feature of xcall(9). This means that pserialize_perform never complete until xc_broadcast of thread A finishes. On the other hand, thread C that is a callee of xc_broadcast of thread A sticks on the mutex. Finally the threads block each other (A blocks B, B blocks C and C blocks A). A possible fix is to serialize executions of the above sequence by another mutex, but adding another mutex makes the code complex, so fix the deadlock by another way; the fix is to release the mutex before pserialize_perform and instead use a condvar to prevent pserialize_perform from being called simultaneously. Note that the deadlock has happened only if NET_MPSAFE is enabled. --- Add missing ifdef NET_MPSAFE --- Take softnet_lock on pr_input properly if NET_MPSAFE Currently softnet_lock is taken unnecessarily in some cases, e.g., icmp_input and encap4_input from ip_input, or not taken even if needed, e.g., udp_input and tcp_input from ipsec4_common_input_cb. Fix them. NFC if NET_MPSAFE is disabled (default). --- - sanitize key debugging so that we don't print extra newlines or unassociated debugging messages. - remove unused functions and make internal ones static - print information in one line per message --- humanize printing of ip addresses --- cast reduction, NFC. --- Fix typo in comment --- Pull out ipsec_fill_saidx_bymbuf (NFC) --- Don't abuse key_checkrequest just for looking up sav It does more than expected for example key_acquire. --- Fix SP is broken on transport mode isr->saidx was modified accidentally in ipsec_nextisr. Reported by christos@ Helped investigations by christos@ and knakahara@ --- Constify isr at many places (NFC) --- Include socketvar.h for softnet_lock --- Fix buffer length for ipsec_logsastr
Revision 1.20 / (download) - annotate - [select for diffs], Wed Jul 5 01:22:40 2017 UTC (6 years, 9 months ago) by ozaki-r
Branch: MAIN
CVS Tags: pgoyette-compat-base,
pgoyette-compat-0521,
pgoyette-compat-0502,
pgoyette-compat-0422,
pgoyette-compat-0415,
pgoyette-compat-0407,
pgoyette-compat-0330,
pgoyette-compat-0322,
pgoyette-compat-0315,
perseant-stdc-iso10646-base,
perseant-stdc-iso10646
Branch point for: pgoyette-compat
Changes since 1.19: +2 -1
lines
Diff to previous 1.19 (colored) to selected 1.1 (colored)
Add update command for testing Updating an SA (SADB_UPDATE) requires that a process issuing SADB_UPDATE is the same as a process issued SADB_ADD (or SADB_GETSPI). This means that update command must be used with add command in a configuration of setkey. This usage is normally meaningless but useful for testing (and debugging) purposes.
Revision 1.19 / (download) - annotate - [select for diffs], Wed Sep 10 21:01:33 2014 UTC (9 years, 7 months ago) by christos
Branch: MAIN
CVS Tags: prg-localcount2-base3,
prg-localcount2-base2,
prg-localcount2-base1,
prg-localcount2-base,
prg-localcount2,
pgoyette-localcount-base,
pgoyette-localcount-20170426,
pgoyette-localcount-20170320,
pgoyette-localcount-20170107,
pgoyette-localcount-20161104,
pgoyette-localcount-20160806,
pgoyette-localcount-20160726,
pgoyette-localcount,
netbsd-8-base,
localcount-20160914,
bouyer-socketcan-base1,
bouyer-socketcan-base,
bouyer-socketcan
Branch point for: netbsd-8
Changes since 1.18: +1 -11
lines
Diff to previous 1.18 (colored) to selected 1.1 (colored)
remove dup
Revision 1.17.6.1 / (download) - annotate - [select for diffs], Mon Feb 25 00:24:03 2013 UTC (11 years, 1 month ago) by tls
Branch: tls-maxphys
Changes since 1.17: +11 -1
lines
Diff to previous 1.17 (colored) next main 1.18 (colored) to selected 1.1 (colored)
resync with head
Revision 1.16.4.2 / (download) - annotate - [select for diffs], Wed Jan 16 05:25:55 2013 UTC (11 years, 3 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.16.4.1: +11 -1
lines
Diff to previous 1.16.4.1 (colored) to branchpoint 1.16 (colored) next main 1.17 (colored) to selected 1.1 (colored)
sync with (a bit old) head
Revision 1.18 / (download) - annotate - [select for diffs], Thu Nov 29 15:31:25 2012 UTC (11 years, 4 months ago) by vanhu
Branch: MAIN
CVS Tags: yamt-pagecache-base9,
yamt-pagecache-base8,
yamt-pagecache-base7,
tls-maxphys-base,
tls-earlyentropy-base,
tls-earlyentropy,
riastradh-xf86-video-intel-2-7-1-pre-2-21-15,
riastradh-drm2-base3,
riastradh-drm2-base2,
riastradh-drm2-base1,
riastradh-drm2-base,
riastradh-drm2,
netbsd-7-nhusb-base-20170116,
netbsd-7-nhusb-base,
netbsd-7-nhusb,
netbsd-7-base,
netbsd-7-2-RELEASE,
netbsd-7-1-RELEASE,
netbsd-7-1-RC2,
netbsd-7-1-RC1,
netbsd-7-1-2-RELEASE,
netbsd-7-1-1-RELEASE,
netbsd-7-1,
netbsd-7-0-RELEASE,
netbsd-7-0-RC3,
netbsd-7-0-RC2,
netbsd-7-0-RC1,
netbsd-7-0-2-RELEASE,
netbsd-7-0-1-RELEASE,
netbsd-7-0,
netbsd-7,
khorben-n900,
agc-symver-base,
agc-symver
Changes since 1.17: +11 -1
lines
Diff to previous 1.17 (colored) to selected 1.1 (colored)
Added support for AES GCM 16 in phase2 negociations. Code from Christophe Carre / NETASQ
Revision 1.16.4.1 / (download) - annotate - [select for diffs], Tue Apr 17 00:01:42 2012 UTC (12 years ago) by yamt
Branch: yamt-pagecache
Changes since 1.16: +2 -1
lines
Diff to previous 1.16 (colored) to selected 1.1 (colored)
sync with head
Revision 1.17 / (download) - annotate - [select for diffs], Mon Jan 9 15:25:13 2012 UTC (12 years, 3 months ago) by drochner
Branch: MAIN
CVS Tags: yamt-pagecache-base6,
yamt-pagecache-base5,
yamt-pagecache-base4,
netbsd-6-base,
netbsd-6-1-RELEASE,
netbsd-6-1-RC4,
netbsd-6-1-RC3,
netbsd-6-1-RC2,
netbsd-6-1-RC1,
netbsd-6-1-5-RELEASE,
netbsd-6-1-4-RELEASE,
netbsd-6-1-3-RELEASE,
netbsd-6-1-2-RELEASE,
netbsd-6-1-1-RELEASE,
netbsd-6-1,
netbsd-6-0-RELEASE,
netbsd-6-0-RC2,
netbsd-6-0-RC1,
netbsd-6-0-6-RELEASE,
netbsd-6-0-5-RELEASE,
netbsd-6-0-4-RELEASE,
netbsd-6-0-3-RELEASE,
netbsd-6-0-2-RELEASE,
netbsd-6-0-1-RELEASE,
netbsd-6-0,
netbsd-6,
matt-nb6-plus-nbase,
matt-nb6-plus-base,
matt-nb6-plus
Branch point for: tls-maxphys
Changes since 1.16: +2 -1
lines
Diff to previous 1.16 (colored) to selected 1.1 (colored)
allow setkey(8) set and display the ESP fragment size in the NAT-T case, userland part of PR kern/44952 by Wolfgang Stukenbrock, just changed the "frag" option name to "esp_frag", for consistency to the existing option of similar effect in racoon(8)
Revision 1.16 / (download) - annotate - [select for diffs], Thu May 26 21:50:02 2011 UTC (12 years, 10 months ago) by drochner
Branch: MAIN
CVS Tags: yamt-pagecache-base3,
yamt-pagecache-base2,
yamt-pagecache-base,
cherry-xenmp-base,
cherry-xenmp
Branch point for: yamt-pagecache
Changes since 1.15: +11 -1
lines
Diff to previous 1.15 (colored) to selected 1.1 (colored)
pull in AES-GCM/GMAC support from OpenBSD This is still somewhat experimental. Tested between 2 similar boxes so far. There is much potential for performance improvement. For now, I've changed the gmac code to accept any data alignment, as the "char *" pointer suggests. As the code is practically used, 32-bit alignment can be assumed, at the cost of data copies. I don't know whether bytewise access or copies are worse performance-wise. For efficient implementations using SSE2 instructions on x86, even stricter alignment requirements might arise.
Revision 1.15 / (download) - annotate - [select for diffs], Fri Jun 4 13:06:03 2010 UTC (13 years, 10 months ago) by vanhu
Branch: MAIN
CVS Tags: matt-mips64-premerge-20101231,
ipsec-tools-0_8_2,
ipsec-tools-0_8_1,
ipsec-tools-0_8_0,
ipsec-tools-0_8-branch,
bouyer-quota2-nbase,
bouyer-quota2-base,
bouyer-quota2
Changes since 1.14: +2 -1
lines
Diff to previous 1.14 (colored) to selected 1.1 (colored)
Added support for spdupdate command in setkey
Revision 1.14 / (download) - annotate - [select for diffs], Thu Oct 29 14:34:27 2009 UTC (14 years, 5 months ago) by christos
Branch: MAIN
CVS Tags: matt-premerge-20091211
Changes since 1.13: +3 -3
lines
Diff to previous 1.13 (colored) to selected 1.1 (colored)
use %option noinput nounput
Revision 1.13 / (download) - annotate - [select for diffs], Wed Oct 28 21:22:49 2009 UTC (14 years, 5 months ago) by christos
Branch: MAIN
Changes since 1.12: +3 -1
lines
Diff to previous 1.12 (colored) to selected 1.1 (colored)
no unput
Revision 1.12.18.1 / (download) - annotate - [select for diffs], Sun Feb 8 18:42:19 2009 UTC (15 years, 2 months ago) by snj
Branch: netbsd-5
CVS Tags: netbsd-5-2-RELEASE,
netbsd-5-2-RC1,
netbsd-5-2-3-RELEASE,
netbsd-5-2-2-RELEASE,
netbsd-5-2-1-RELEASE,
netbsd-5-2,
netbsd-5-1-RELEASE,
netbsd-5-1-RC4,
netbsd-5-1-RC3,
netbsd-5-1-RC2,
netbsd-5-1-RC1,
netbsd-5-1-5-RELEASE,
netbsd-5-1-4-RELEASE,
netbsd-5-1-3-RELEASE,
netbsd-5-1-2-RELEASE,
netbsd-5-1-1-RELEASE,
netbsd-5-1,
netbsd-5-0-RELEASE,
netbsd-5-0-RC4,
netbsd-5-0-RC3,
netbsd-5-0-RC2,
netbsd-5-0-2-RELEASE,
netbsd-5-0-1-RELEASE,
netbsd-5-0,
matt-nb5-pq3-base,
matt-nb5-pq3,
matt-nb5-mips64-u2-k2-k4-k7-k8-k9,
matt-nb5-mips64-u1-k1-k5,
matt-nb5-mips64-premerge-20101231,
matt-nb5-mips64-premerge-20091211,
matt-nb5-mips64-k15,
matt-nb5-mips64,
matt-nb4-mips64-k7-u2a-k9b
Changes since 1.12: +1 -1
lines
Diff to previous 1.12 (colored) next main 1.13 (colored) to selected 1.1 (colored)
Apply patch (requested by manu/spz in #378): Downgrade ipsec-tools to 0.7.1nb1.
Revision 1.11.4.1 / (download) - annotate - [select for diffs], Mon Sep 3 06:51:26 2007 UTC (16 years, 7 months ago) by wrstuden
Branch: wrstuden-fixsa
Changes since 1.11: +2 -6
lines
Diff to previous 1.11 (colored) next main 1.12 (colored) to selected 1.1 (colored)
Sync w/ NetBSD-4-RC_1
Revision 1.11.2.1 / (download) - annotate - [select for diffs], Tue Aug 28 11:14:50 2007 UTC (16 years, 7 months ago) by liamjfoy
Branch: netbsd-4
CVS Tags: wrstuden-fixsa-newbase,
wrstuden-fixsa-base-1,
wrstuden-fixsa-base,
netbsd-4-0-RELEASE,
netbsd-4-0-RC5,
netbsd-4-0-RC4,
netbsd-4-0-RC3,
netbsd-4-0-RC2,
netbsd-4-0-RC1,
netbsd-4-0-1-RELEASE,
netbsd-4-0
Changes since 1.11: +2 -6
lines
Diff to previous 1.11 (colored) next main 1.12 (colored) to selected 1.1 (colored)
Pull up following revision(s) (requested by manu in ticket #830): Import ipsec-tools 0.7
Revision 1.11.6.1 / (download) - annotate - [select for diffs], Wed Aug 1 11:52:23 2007 UTC (16 years, 8 months ago) by vanhu
Branch: ipsec-tools-0_7-branch
CVS Tags: ipsec-tools-0_7_3,
ipsec-tools-0_7_2,
ipsec-tools-0_7_1,
ipsec-tools-0_7
Changes since 1.11: +2 -6
lines
Diff to previous 1.11 (colored) next main 1.12 (colored) to selected 1.1 (colored)
use a single PATH_IPSEC_H to fix some path_to_ipsec.h issues
Revision 1.12.16.2 / (download) - annotate - [select for diffs], Wed Jul 18 12:07:54 2007 UTC (16 years, 9 months ago) by vanhu
Branch: matt-mips64
Changes since 1.12.16.1: +356 -0
lines
Diff to previous 1.12.16.1 (colored) to branchpoint 1.12 (colored) next main 1.13 (colored) to selected 1.1 (colored)
use a single PATH_IPSEC_H to fix some path_to_ipsec.h issues
Revision 1.12.16.1, Wed Jul 18 12:07:53 2007 UTC (16 years, 9 months ago) by vanhu
Branch: matt-mips64
Changes since 1.12: +0 -356
lines
FILE REMOVED
file token.l was added on branch matt-mips64 on 2007-07-18 12:07:54 +0000
Revision 1.12 / (download) - annotate - [select for diffs], Wed Jul 18 12:07:53 2007 UTC (16 years, 9 months ago) by vanhu
Branch: MAIN
CVS Tags: yamt-pf42-baseX,
yamt-pf42-base4,
yamt-pf42-base3,
yamt-pf42-base2,
yamt-pf42-base,
yamt-pf42,
wrstuden-revivesa-base-3,
wrstuden-revivesa-base-2,
wrstuden-revivesa-base-1,
wrstuden-revivesa-base,
wrstuden-revivesa,
netbsd-5-base,
netbsd-5-0-RC1,
mjf-devfs2-base,
mjf-devfs2,
matt-mips64-base2,
matt-mips64-base,
matt-armv6-prevmlocking,
matt-armv6-nbase,
matt-armv6-base,
matt-armv6,
keiichi-mipv6-base,
keiichi-mipv6,
jym-xensuspend-nbase,
jym-xensuspend-base,
jym-xensuspend,
hpcarm-cleanup-nbase,
hpcarm-cleanup-base,
hpcarm-cleanup,
cube-autoconf-base,
cube-autoconf
Branch point for: netbsd-5,
matt-mips64
Changes since 1.11: +2 -6
lines
Diff to previous 1.11 (colored) to selected 1.1 (colored)
use a single PATH_IPSEC_H to fix some path_to_ipsec.h issues
Revision 1.11 / (download) - annotate - [select for diffs], Fri Oct 6 12:02:27 2006 UTC (17 years, 6 months ago) by manu
Branch: MAIN
CVS Tags: netbsd-4-base,
ipsec-tools-0_7-rc1,
ipsec-tools-0_7-beta3,
ipsec-tools-0_7-beta2,
ipsec-tools-0_7-beta1,
ipsec-tools-0_7-base,
ipsec-tools-0_7-RC1
Branch point for: wrstuden-fixsa,
netbsd-4,
ipsec-tools-0_7-branch
Changes since 1.10: +6 -1
lines
Diff to previous 1.10 (colored) to selected 1.1 (colored)
Camelia cipher support as in RFC 4312, from Tomoyuki Okazaki <okazaki@kick.gr.jp>
Revision 1.10 / (download) - annotate - [select for diffs], Tue Sep 19 07:51:32 2006 UTC (17 years, 7 months ago) by vanhu
Branch: MAIN
Changes since 1.9: +4 -1
lines
Diff to previous 1.9 (colored) to selected 1.1 (colored)
From Larry Baird: define SADB_X_EALG_AESCBC as SADB_X_EALG_AES if needed
Revision 1.9 / (download) - annotate - [select for diffs], Sat Sep 9 16:22:37 2006 UTC (17 years, 7 months ago) by manu
Branch: MAIN
Changes since 1.8: +3 -1
lines
Diff to previous 1.8 (colored) to selected 1.1 (colored)
Migration of ipsec-tools to NetBSD CVS part 2: resolving the import conflicts. Since we previously had a release branch and we import here the HEAD of CVS, let's assume all local changes are to be dumped. Local patches should have been propagated upstream, anyway.
Revision 1.1.1.4 / (download) - annotate - [select for diffs] (vendor branch), Sat Sep 9 16:13:03 2006 UTC (17 years, 7 months ago) by manu
Branch: IPSEC_TOOLS
CVS Tags: ipsec-tools-base
Changes since 1.1.1.3: +3 -1
lines
Diff to previous 1.1.1.3 (colored) to selected 1.1 (colored)
Migrate ipsec-tools CVS to cvs.netbsd.org
Revision 1.1.1.2.2.4 / (download) - annotate - [select for diffs], Mon Nov 21 21:12:34 2005 UTC (18 years, 5 months ago) by tron
Branch: netbsd-3
CVS Tags: netbsd-3-1-RELEASE,
netbsd-3-1-RC4,
netbsd-3-1-RC3,
netbsd-3-1-RC2,
netbsd-3-1-RC1,
netbsd-3-1-1-RELEASE,
netbsd-3-1,
netbsd-3-0-RELEASE,
netbsd-3-0-RC6,
netbsd-3-0-RC5,
netbsd-3-0-RC4,
netbsd-3-0-RC3,
netbsd-3-0-RC2,
netbsd-3-0-3-RELEASE,
netbsd-3-0-2-RELEASE,
netbsd-3-0-1-RELEASE,
netbsd-3-0
Changes since 1.1.1.2.2.3: +1 -1
lines
Diff to previous 1.1.1.2.2.3 (colored) to branchpoint 1.1.1.2 (colored) next main 1.1.1.3 (colored) to selected 1.1 (colored)
Apply patch (requested by manu in ticket #981): Update ipsec-tools to version 0.6.3.
Revision 1.8 / (download) - annotate - [select for diffs], Mon Nov 21 14:20:36 2005 UTC (18 years, 5 months ago) by manu
Branch: MAIN
CVS Tags: abandoned-netbsd-4-base,
abandoned-netbsd-4
Changes since 1.7: +0 -0
lines
Diff to previous 1.7 (colored) to selected 1.1 (colored)
Merge ipsec-tools 0.6.3 import
Revision 1.1.1.2.2.3 / (download) - annotate - [select for diffs], Sat Sep 3 07:03:56 2005 UTC (18 years, 7 months ago) by snj
Branch: netbsd-3
CVS Tags: netbsd-3-0-RC1
Changes since 1.1.1.2.2.2: +6 -15
lines
Diff to previous 1.1.1.2.2.2 (colored) to branchpoint 1.1.1.2 (colored) to selected 1.1 (colored)
Apply patch (requested by tron in ticket #741): Update ipsec-tools to version 0.6.1.
Revision 1.7 / (download) - annotate - [select for diffs], Sat Aug 20 00:57:29 2005 UTC (18 years, 8 months ago) by manu
Branch: MAIN
Changes since 1.6: +1 -1
lines
Diff to previous 1.6 (colored) to selected 1.1 (colored)
Update to ipsec-tools 0.6.1
Revision 1.6 / (download) - annotate - [select for diffs], Sun Aug 7 09:38:46 2005 UTC (18 years, 8 months ago) by manu
Branch: MAIN
Changes since 1.5: +2 -3
lines
Diff to previous 1.5 (colored) to selected 1.1 (colored)
Resolve conflicts caused by recent ipsec-tools-0.6.1rc1 import by prefering the newer software. Some useful local change might have been overwritten, we'll take care of this soon.
Revision 1.1.1.3 / (download) - annotate - [select for diffs] (vendor branch), Sun Aug 7 08:49:36 2005 UTC (18 years, 8 months ago) by manu
Branch: IPSEC_TOOLS
CVS Tags: ipsec-tools-0_6_3,
ipsec-tools-0_6_2,
ipsec-tools-0_6_1-rc1,
ipsec-tools-0_6_1
Changes since 1.1.1.2: +9 -13
lines
Diff to previous 1.1.1.2 (colored) to selected 1.1 (colored)
Update ipsec-tools to 0.6.1rc1 Most of the changes since 0.6b4 have already been committed to the NetBSD tree. This upgrade fixes some IPcomp and NAT-T related problems that were left unadressed in the NetBSD tree.
Revision 1.5 / (download) - annotate - [select for diffs], Tue Jul 12 16:49:52 2005 UTC (18 years, 9 months ago) by manu
Branch: MAIN
Changes since 1.4: +4 -1
lines
Diff to previous 1.4 (colored) to selected 1.1 (colored)
Add SHA2 support
Revision 1.4 / (download) - annotate - [select for diffs], Sun Jun 26 23:49:31 2005 UTC (18 years, 9 months ago) by christos
Branch: MAIN
Changes since 1.3: +3 -14
lines
Diff to previous 1.3 (colored) to selected 1.1 (colored)
Collect externs into one file instead of duplicating them everywhere.
Revision 1.1.1.2.2.2 / (download) - annotate - [select for diffs], Wed May 11 12:16:57 2005 UTC (18 years, 11 months ago) by tron
Branch: netbsd-3
Changes since 1.1.1.2.2.1: +1 -1
lines
Diff to previous 1.1.1.2.2.1 (colored) to branchpoint 1.1.1.2 (colored) to selected 1.1 (colored)
Pull up revision 1.3 (requested by manu in ticket #277): More NAT-T fixes for the situation where racoon acts as a VPN client Flush SA and generated SP on DPD timeout and deletion payloads
Revision 1.3 / (download) - annotate - [select for diffs], Sun May 8 08:57:26 2005 UTC (18 years, 11 months ago) by manu
Branch: MAIN
Changes since 1.2: +2 -2
lines
Diff to previous 1.2 (colored) to selected 1.1 (colored)
More NAT-T fixes for the situation where racoon acts as a VPN client Flush SA and generated SP on DPD timeout and deletion payloads
Revision 1.1.1.2.2.1 / (download) - annotate - [select for diffs], Tue Apr 12 09:29:41 2005 UTC (19 years ago) by tron
Branch: netbsd-3
Changes since 1.1.1.2: +5 -0
lines
Diff to previous 1.1.1.2 (colored) to selected 1.1 (colored)
Pull up revision 1.2 (requested by manu in ticket #132): Resurrect TCP-MD5 support. This fixes bin/29915
Revision 1.2 / (download) - annotate - [select for diffs], Sun Apr 10 21:20:55 2005 UTC (19 years ago) by manu
Branch: MAIN
Changes since 1.1: +7 -0
lines
Diff to previous 1.1 (colored)
Resurrect TCP-MD5 support. This fixes bin/29915
Revision 1.1.1.2 / (download) - annotate - [select for diffs] (vendor branch), Wed Feb 23 14:54:40 2005 UTC (19 years, 1 month ago) by manu
Branch: IPSEC_TOOLS
CVS Tags: netbsd-3-base,
ipsec-tools-0_6-20050317,
ipsec-tools-0_6-20050314,
ipsec-tools-0_6-20050224,
ipsec-tools-0_6-20050223
Branch point for: netbsd-3
Changes since 1.1.1.1: +2 -0
lines
Diff to previous 1.1.1.1 (colored) to selected 1.1 (colored)
Import ipsec-tools 0.6 branch as of 2005/02/23. News from last imported version
according to ipsec-tools' ChangeLog:
2005-02-23 Emmanuel Dreyfus <manu@netbsd.org>
* configure.ac, src/racoon/{Makefile.am|crypto_openssl.c}: optionnal
support for patented algorithms: IDEA and RC5.
* src/racoon/{isakmp_xauth.c|main.c}: don't initialize RADIUS if it
is not required in the configuration
* src/racoon/isakmp.c: do not reject addresses for which kernel
refused UDP encapsulation, they can still be used for non NAT-T
traffic (eg: NAT-T enabled racoon on non NAT-T enabled kernel)
2005-02-18 Emmanuel Dreyfus <manu@netbsd.org>
* src/racoon/{main.c|eaytest.c|plairsa-gen.c}
src/setkey/setkey.c: don't use fuzzy paths for package_version.h
2005-02-18 Yvan Vanhullebus <vanhu@free.fr>
* src/racoon/isakmp_inf.c: Purge generated SPDs when getting a
related DELETE_SA
* src/racoon/pfkey.c: do NOT unbindph12() when SA acquire
2005-02-17 Emmanuel Dreyfus <manu@netbsd.org>
From Fred Senault <fred.letter@lacave.net>
* src/racoon/remoteconf.c: Fix a bug in script init
2005-02-17 Yvan Vanhullebus <vanhu@free.fr>
* src/racoon/ipsec_doi.c: Workaround for phase1 lifetime checks
2005-02-15 Michal Ludvig <michal@logix.cz>
* configure.ac: Changed --enable-natt_NN to --enable-natt-versions=NN,NN
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Sat Feb 12 11:14:07 2005 UTC (19 years, 2 months ago) by manu
Branch: IPSEC_TOOLS
CVS Tags: ipsec-tools-0_6-base
Changes since 1.1: +0 -0
lines
Diff to previous 1.1 (colored)
Import ipsec-tools (tag ipsec-tools-0_6-base in ipsec-tools CVS) ipsec-tools is a fork from KAME racoon/libipsec/setkey, with many enhancements.
Revision 1.1 / (download) - annotate - [selected], Sat Feb 12 11:14:07 2005 UTC (19 years, 2 months ago) by manu
Branch: MAIN
Initial revision