Merge branch 'reauth-collision'
authorMartin Willi <martin@revosec.ch>
Thu, 17 Apr 2014 08:14:49 +0000 (10:14 +0200)
committerMartin Willi <martin@revosec.ch>
Thu, 17 Apr 2014 08:14:49 +0000 (10:14 +0200)
commit95083fc6fb6ad13b9055f3df594e7f5ba77332dc
treeffa4a5a71ec48af3c419ed2fdbc86b2e898043ae
parent094963d1b16024c56adc624cc97729ce424e2814
parent0b3bea39653f4d93bcff4011f3e255cd82400390
Merge branch 'reauth-collision'

Fixes two collisions between IKE_SA re-authentication and CHILD_SA rekeying.