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

[Andrew Cagney]

New commits:
commit 3f60371901c32284c4e641c0594907673c352ea2
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jul 16 15:53:08 2018 -0400

    ike_alg: merge alg headers into ike_alg_{hash,prf,integ,encrypt}.h
    
    This makes it consistent with ike_alg_dh.h which has all the #ifdefs
    deciding if an algorithm should be declared in one place.  While not
    pretty it should be easier to maintain.