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

[Andrew Cagney]

New commits:
commit b6fc86b48812c4b41c6633bb22cb16220f445b4e
Merge: c5f30a3 4ed08d2
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Nov 8 10:45:32 2016 -0500

    pluto: when constructing ike_info, set .ike_encrypt, .ike_prf, .ike_integ, and .ike_dh_group
    
    Any ike= entries with an unknown encrypt, prf, integ, or group get
    dropped (and logged loudly, not so before?).  Code using struct ike_info
    can assume these fields are valid.
    
    It doesn't weed out IKEv1/IKEv2 specific algorithms but probably should.
    
    The old fields ike_ealg, ike_halg, and ike_modp are effectively redundant.
    
    Merge commit '4ed08d21816a3bada2b326431e8c35b63f935db2'

commit 4ed08d21816a3bada2b326431e8c35b63f935db2
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Nov 7 12:01:31 2016 -0500

    pluto: initialize ike_info.ike_dh_group

commit 177965d02f939f6c29d1f115dcaa4535e0e40674
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Nov 7 11:55:02 2016 -0500

    pluto: initialize ike_info.ike_integ

commit 9142c2be79c8360c5436fc53b0bf070c944083b8
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Nov 7 11:48:54 2016 -0500

    pluto: initialize ike_info.ike_prf

commit 56caaa0800394bc67fedb8b19a8347af56fd0d9f
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Nov 7 11:35:41 2016 -0500

    pluto: initialize ike_info.ike_encrypt