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

[Paul Wouters]

New commits:
commit 630e938773b233f77fc4494fc8dbf2c3ac94253a
Merge: b33de97 2fabc80
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:36:58 2013 -0500

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

commit b33de97b492eb10ba95e1224dbf5bfa9d657538d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:36:07 2013 -0500

    ikev2: no longer abort (and crash) on STF_INTERNAL_ERROR
    
    This is now the same as IKEv1, which also does not crash on these.

commit 523ee509f7110862dd497027a58dd327c40ad804
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:35:35 2013 -0500

    ikev2: some out_srtuct various used bad return_on() macro or ignored return code

commit 22797771dbaef8364dd9696374474a9d187e43eb
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:35:02 2013 -0500

    uncrustify anomaly

commit af7fe58fffe50e01da1a16525702991da9032419
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:33:04 2013 -0500

    clarified some fields and added enums to ft_enum entries that missed it
    
    Note that ikev2trans_fields has a field for IKEv2 transform ID but
    we cannot enum that because its exact ID type depends on the
    transform tye (enc 0, auth 1, integ 2) and the lists of these are
    slightly different (for AUTH_NONE with integ)

commit 7a3ade76a3385a90d7ef3e33a7467a7945c3ae26
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:32:28 2013 -0500

    changed two enum_name()s to enum_showb()s

commit d57d871dc1e7a3176956a29c82b3d5bf1592a6cc
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:31:36 2013 -0500

    ikev2_trans_type_encr_names upper entry wasn't updated.
    
    So we were missing entries between IKEv2_ENCR_AES_CTR and
    IKEv2_ENCR_CAMELLIA_CCM_C.

commit c8f70b512eb88bcc872e1d4b50195e1851303152
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 30 21:31:15 2013 -0500

    added comment