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

[Andrew Cagney]

New commits:
commit 38306205cf39bbb5f6f04cfe08a128ca81ff1573
Merge: 5f3015b aeea223
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 24 09:20:49 2017 -0400

    pluto: don't add the default key-length to 'IKE algorithms: ...' lines
    
    Merge commit 'aeea2234636d198d54d9d64e48caaeb89d231140'

commit aeea2234636d198d54d9d64e48caaeb89d231140
Author: Andrew Cagney <cagney at gnu.org>
Date:   Wed Aug 23 12:26:36 2017 -0400

    pluto: don't add default key length when displaying 'IKE algorithms: ...'
    
    else it isn't possible to differentiate between ike=aes and
    ike=aes_128, which are very different and doesn't match the proposal
    which strongly prefers MAX key-length.
    
    Displaying and parsing something like:
    
      AES_CBC_256+AES_CBC_128-...
    
    would be nice (but note that ESP reverses this).

commit 958a38e1cdd66d8f928daca2660a0440b0be38ea
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 24 07:45:07 2017 -0400

    testing: don't expect 'default' key-length in 'IKE algorithms: ...' line