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

[Antony Antony]

New commits:
commit ee35d86eead78a5bbe3abb0cd4b4cae3133090d0
Author: Antony Antony <antony at phenome.org>
Date:   Thu Apr 2 20:19:42 2015 -0500

    ikev1: wrap the FIPS check in ifdef. tweaking ad9419aac0de2b27503abdf
    move the second "Missing prf" to main_inI2_outR2_tail,
    main_inI2_outR2_continue returns void can't handle error.