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

[Andrew Cagney]

New commits:
commit 8c5fb9758553f57b9f422fd2ad1025d5a48bf4c9
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Oct 28 16:31:04 2016 -0400

    pluto: add constants for AES_CMAC

commit 078394c01e37f3b2d919482d68f2d35bee6b69cc
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Oct 28 11:23:51 2016 -0400

    pluto: ike_info.algo_id -> ike_info.ikev1_oakley_id
    
    So it clearly matches its intended use - OAKLEY_...
    
    Where possible, fill in the missing values.