henceforth => hence: use the right archaic word
fix dpd_action_names
start tidying up events
testing: ikev2-algo-sha2-06 needs different esp= line to trigger the bug
clarify comments on IKEv2 states, payloads, and protocol
reduce dangerous redundancy in addconn.c
ikev2_delete_desc: use ft_enum for protocol ID for better checking
Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
Add comment to process_v2_packet() got lsb#185
update a comment
minor cleanup in state.c
updated comments in state.h
IKEv2: Fix process_informational_ikev2() for Delete payloads [Paul/Hugh]

An incomplete Child SA has the same SPIs as its Parent SA and could
accidentally be matched by the state machine to process the Informational
Exchange. If such informational message contained an IKE SA Delete
payload, it would trigger a passert in v2_delete_my_family() which
insisted to be given a Parent SA. We now switch to the parent if detected.

The RFC forbids mixing IKE and IPsec Deletes. IKE SA delete payload
SPI numbers and SPI size MUST be zero. This was not enforced.

Syntax errors in Delete payloads were ignored instead of failed.

Convoluted SPI logging simplified.
testing: fix excludeded/alloweded in known good output
pluto: make timer.c code IKE version independant with IS_IKE_SA()

The timer code checked for IKEv1 phase1 and phase1.5, and assumed
everything else was an ipsec sa. This included IKEv2 Parent SA's.

the new macro IS_IKE_SA() returns true for either a v1 or v2 ISAKMP SA
ikev2: when deleting CHILD_SA without a IKE SA don't try to send v2D.
testing: ikev2-20-ikesa-replace
Remove some unnecessary NAT-T debug messages that sometimes lied, ex:

pluto[8560]: |  st_localport != pluto_nat_port (4500 != 4500)
pluto: Added IS_IKE_SA_ESTABLISHED(s) which works on IKEv1 and IKEv2

which is defined as:

	(IS_ISAKMP_SA_ESTABLISHED(s) || IS_V2_ESTABLISHED(s))
ipsec_doi: use new IS_IKE_SA()