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

[Paul Wouters]

New commits:
commit 4f4baa0326d472e38d3fae2cca5645afebd28797
Merge: 41a6d16 77f97f5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 12 18:34:58 2014 -0400

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

commit 41a6d161744d5172f0502f72daee0242276af6c0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 12 18:15:23 2014 -0400

    testing: libswan argpase added esp=aes128-aes_cbc and esp=aes128-sha2_128
    
    aes_cbc is a valid AUTH algo. sha2_128 is not (sha2_256 returns 128 bits)

commit a544665e042dbf98c9dc32acaa7a35ef450e617c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 12 18:13:50 2014 -0400

    liswan: Add missing IANA entries for alg_info_esp_aa2sadb()