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

[Paul Wouters]

New commits:
commit 0407288447577987211da544da82cb20e87d6d51
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 26 13:20:40 2014 -0400

    pluto: added entries and clarified alg_info_esp_v2tov1aa() and alg_info_esp_sadb2aa()
    
    alg_info_esp_sadb2aa() is a bad function because there is no 1 to 1
    mapping of AH_XXX algorithms to "Authentication Algorithms", as the
    AA depends on the IKE version.

commit ce298bee51250ccefc6a9b5da13a93fc50fe67ea
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 26 13:19:01 2014 -0400

    IKEv1: complete compute_proto_keymat() functions with newer hash algos