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

[Paul Wouters]

New commits:
commit 9564b2601378af3dc63b90fe887155dc5cf1f5d5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:33:43 2014 -0400

    alg parser: remove support for "idXXX" esp/ike transform IDs
    
    (as we don't know the right block size or key size of future algos
     anyway)

commit dc575d2ad03e2d54d04d9934eeced7bb90e24bbd
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:30:58 2014 -0400

    pluto: fix alias code - warning: missing braces around initializer

commit ded0ffd96bf40d78f60082238b487872fc3cfcd8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:27:49 2014 -0400

    remove "typo" aliases for sha/sha2

commit adaf944e494e2b0cf0d0e746ff1d91db977ee11d
Merge: d0f372d b0a613c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:06:54 2014 -0400

    Merge branch 'master' into alg_info_alias
    
    Conflicts:
    	lib/libswan/alg_info.c

commit b0a613cd89f2ee9381a7b7fa18a658381e75aa5d
Merge: b62db67 9a06430
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:02:30 2014 -0400

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

commit d0f372d52379887c6f6e2e2dc512be33ae1ba7b5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 23 00:00:42 2014 -0400

    pluto: change alias table for ESP ciphers - add clarifying comment
    
    This still runs into issues with using numbers in aliases. The alias
    aes_ccm_16 won't work as this is still seen as aes_ccm with key size
    16.
    
    the updated alias table does correctly alias aes_cbc to aes, and
    aesctr to aes_ctr and aes_ccm to aes_ccm_16.

commit b62db6739379983179befa11ed555686fc141894
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed May 21 12:34:01 2014 -0400

    testing: more testcases for algparse.c

commit c8f0f466bfcaa0d28f186337aaba8aad96f626d8
Author: Matt Rogers <mrogers at redhat.com>
Date:   Mon Apr 21 12:07:23 2014 -0400

    testing: add esp alias tests to algparse.c

commit 217833dfc0266d72b7bcc35bf969d45bf67cfc6b
Author: Matt Rogers <mrogers at redhat.com>
Date:   Mon Apr 21 11:45:58 2014 -0400

    libswan: add alg_find_alias() and alias tables for esp/auth algorithms