[Swan-commit] Changes to ref refs/heads/master

[Andrew Cagney]

New commits:
commit 9cdbb0710c182c8f06bf3a4e0cd372317b95efeb
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Nov 28 17:04:40 2018 -0500

    ikev2: hardwire timeout for inR1outI2 transition to EVENT_SA_EXPIRE in PLUTO_HALFOPEN_SA_LIFE
    
    Was calling ikev2_replace_delay() with the event
    EVENT_SA_v2_RETRANSMIT (which is intended for the child) and then,
    because PLUTO_HALFOPEN_SA_LIFE <= .sa_rekey_margin (aka
    SA_REPLACEMENT_MARGIN_DEFAULT) is pretty much always true, force the
    event to EVENT_SA_EXPIRE.
    
    Another case of IKE and CHILD SAs having a mashed together state
    transition.
    
    pexpect ikev2_replace_delay() to only be called with EVENT_SA_REPLACE.