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

Paul Wouters paul at vault.libreswan.fi
Wed Nov 5 18:10:45 EET 2014 

New commits:
commit 8c61b231f8104dad05e836beaea9adb595a0cba4
Merge: 276a765 1c8eade
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Nov 5 11:07:32 2014 -0500

    Merge branch 'ssw521' into antony-2014nov
    
    Conflicts:
    	testing/pluto/interop-ikev2-strongswan-21-strongswan-cp-psk/east.console.txt
    	testing/pluto/interop-ikev2-strongswan-21-strongswan-cp-psk/road.console.txt
    	testing/pluto/interop-ikev2-strongswan-22-cp-responder-psk/east.console.txt
    	testing/pluto/interop-ikev2-strongswan-22-cp-responder-psk/road.console.txt
    	testing/pluto/interop-ikev2-strongswan-23-initiator-cp/road.console.txt

commit 276a765f9ff5e443244946364603ec6aa50e0294
Author: Antony Antony <antony at phenome.org>
Date:   Wed Nov 5 15:09:57 2014 +0100

    testing: remove duplicate test interop-ikev2-strongswan-21-strongswan-cp-psk

commit 5d961a2937f2569a3439a669555702628a85dd43
Author: Antony Antony <antony at phenome.org>
Date:   Wed Nov 5 15:08:35 2014 +0100

    testing: sanitizer change

commit 1c8eade6498a3489cb7cf86c5fe59b2add978c51
Author: Antony Antony <antony at phenome.org>
Date:   Wed Nov 5 15:08:35 2014 +0100

    testing: sanitizer change

commit 1919537a847a8cb680f19dabfa23410db78bf068
Author: Antony Antony <antony at phenome.org>
Date:   Wed Nov 5 00:47:58 2014 +0200

    testing: interop CP tests.

commit 9bb771895cae5c9b4670137e5a6ec49d9741242c
Author: Antony Antony <antony at phenome.org>
Date:   Wed Nov 5 00:23:40 2014 +0200

    testing: updates, rekey=no
    ikev2 liveness tests, action clear and restart with instantiation

commit 82d5c73c344d1e593037423302fd11cb1c5d00ed
Author: Antony Antony <antony at phenome.org>
Date:   Tue Nov 4 23:46:33 2014 +0200

    Revert "ikev2: if applicable, add a CERTREQ payload in the IKE_SA_INIT response"
    
    This reverts commit 759537ec1427dbb826f81877c70d232f101f958b.
    
    Conflicts:
    	programs/pluto/ikev2.h

commit f2167178bd8bab2177a752c924cb86ea5a6df8d2
Merge: e3d1e4d aae6860
Author: Antony Antony <antony at phenome.org>
Date:   Tue Nov 4 08:03:41 2014 -0500

    Merge branch 'antony-2014nov' of ssh://swantest.libreswan.fi/home/build/libreswan into antony-2014nov

commit e3d1e4db4ebd7469c43b51c794a40e0de982f3ca
Author: Antony Antony <antony at phenome.org>
Date:   Mon Nov 3 08:29:52 2014 -0500

    ikev2: parse CP reply,
    install INTERNAL_IP4_ADDRESS and DNS on initiator.

commit aae6860d45c8cf6001f285710769362e56706d03
Author: Antony Antony <antony at phenome.org>
Date:   Tue Nov 4 02:27:42 2014 +0200

    ikev2: add  CP, optional encrypted payload, to smc entry  R1

commit cb4a3c140950a6835e00deb9fe7cba688e2ce152
Merge: 66aab32 62fdfcc
Author: Antony Antony <antony at phenome.org>
Date:   Mon Nov 3 23:55:38 2014 +0200

    Merge branch 'antony-2014nov' of vault.libreswan.fi:/srv/src/libreswan into antony-2014nov

commit 62fdfcc51c7ca6a3f4475e1715cec897065bb6d0
Merge: 14aadf0 f39acfe
Author: Antony Antony <antony at phenome.org>
Date:   Mon Nov 3 11:12:10 2014 -0500

    Merge branch 'master' into antony-2014nov

commit 14aadf0b1b678e10c2f06cdac5afd13014bd2829
Merge: 0e8e5f8 5118221
Author: Antony Antony <antony at phenome.org>
Date:   Mon Nov 3 11:11:11 2014 -0500

    Merge branch 'master' into antony-2014nov

commit 0e8e5f8cb3ae030dff927737efbbda4523b600c7
Author: Antony Antony <antony at phenome.org>
Date:   Mon Nov 3 11:08:01 2014 -0500

    ikev2: don't try to decrypt if DH is incomplete

commit 66aab32f8578d3eb2e4be012d1e0c50eae24e335
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 2 21:48:28 2014 -0500

    pluto: get rid of spurious \n at end of format in calls to loglog

commit 759537ec1427dbb826f81877c70d232f101f958b
Author: Antony Antony <antony at phenome.org>
Date:   Sun Nov 2 00:46:42 2014 -0400

    ikev2: if applicable, add a CERTREQ payload in the IKE_SA_INIT response

commit d7d3a90b3083ec730b81bb1ca4d03e4e01cfe000
Author: Antony Antony <antony at phenome.org>
Date:   Sat Nov 1 07:29:24 2014 -0400

    ikev2: fix parent I2 replace event delay.

commit d4d1fab2d8851bee1068d8f496837874318ee99b
Author: Antony Antony <antony at phenome.org>
Date:   Fri Oct 31 17:55:48 2014 -0400

    fix a typo left old line there

commit f8314813116c067386a4668ac3e2e6700ff56996
Author: Antony Antony <antony at phenome.org>
Date:   Fri Oct 31 14:02:10 2014 -0400

    merge v1 and v2 dpd/liveness action clear

commit d287d5fae96b62fc949af84226e969b620acb711
Author: Antony Antony <antony at phenome.org>
Date:   Fri Oct 31 00:05:19 2014 +0200

    continuation of d4508e8a29

commit d4508e8a2968a309e2aa815390864ca3efaf4733
Author: Antony Antony <antony at phenome.org>
Date:   Thu Oct 30 10:27:02 2014 -0500

    dpd/liveness fix issues restarting  instantiated connection

commit befe46b69aa22a24c5bb17bc3748c44a5de4b884
Merge: c2dc2cf 8f48b8c
Author: Antony Antony <antony at phenome.org>
Date:   Thu Oct 30 10:24:28 2014 -0500

    Merge branch 'master' into antony-2014nov

commit 5d047a721138ce9421c692f0421292b851ddb54e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 23:06:05 2014 -0400

    testing: another set of strongswan test case updates
    
    due to newer version, minor script fixes, sanitizer updates

commit 81bce9109466aa2aecfcef38181297df9e60622c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 22:47:48 2014 -0400

    testing: strongswan updates from version and sanitizer update

commit 7136e4575659e3b127e365776d4eb160f3138939
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 22:46:05 2014 -0400

    testing: update strongswan sanitizer for ephemeral timing data

commit 0bbc28d7161d5a42998e22af436f53bf9f09ffdd
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:25:29 2014 -0400

    testing: interop-ikev2-strongswan-23-initiator-cp fix ping command

commit af9787c49dbc1f40a6e469f090c3c6fde0041658
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:20:47 2014 -0400

    testing: interop-ikev2-strongswan-23-initiator-cp add strongswan sanitizer

commit 43c4df328be05c9fa2aeeda81c54c591681ef0c9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:13:29 2014 -0400

    testing: interop-ikev2-strongswan-16-ah-initiator-sha25 reference update
    
    strongswan added CERTREQ payload and debug line

commit 422f75bec62279193991eb7a7838ddab27395faa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:12:30 2014 -0400

    testing: interop-ikev2-strongswan-16-ah-initiator-sha512 reference update
    
    strongswan added CERTREQ payload and debug line

commit 317d6e77c3176a60e96ec9c91ed088cde231fe2f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:11:10 2014 -0400

    testing: updated reference output interop-ikev1-strongswan-14-camellia

commit c84489daea19dec01a1b9ed9140c22eccae8e654
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 29 21:10:24 2014 -0400

    testing: interop-ikev1-strongswan-14-camellia disable IKE camellia
    
    Use aes256 for IKE for now so we can test ESP

commit c2dc2cf562d4ce851f63b5492443831f16d2cb86
Merge: 3ce901e 109a9e2
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 29 05:05:16 2014 +0200

    Merge branch 'hugh-2014oct' of vault.libreswan.fi:/srv/src/libreswan into hugh-2014oct

commit 3ce901e23b8cb1fb0dfe9b29d187b279d54d2fcc
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 29 05:03:27 2014 +0200

    ikev2: if rekey=no schedule and expire event instead of replace.

commit 109a9e22b327f065a234d72b82332ce2824ea592
Merge: 1edfaf0 083470a
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 27 10:09:15 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit 1edfaf0927ec9ae310ec77666af47bcd5b4db780
Merge: 7ba14aa 949c663
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 27 10:08:19 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit 7ba14aa18b8608b11e0ff19d50d5ed81846670c3
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 27 08:04:49 2014 -0500

    ikev2: liveness/dpd clear action for CK_INSTACE already calls unroute

commit 00f66f499fc160939c08207b3becfa97b5307f74
Merge: cfc0b1b 8aeff6f
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 27 22:20:28 2014 +0200

    Merge branch 'master' into hugh-2014oct

commit cfc0b1b914eaa7ae0fa1f36efcb728425bcf8da3
Merge: 3f495c3 8abb1e2
Author: Antony Antony <antony at phenome.org>
Date:   Sun Oct 26 02:47:40 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit 3f495c3235f7038f67388559d58adbadcbdb87ec
Merge: 636a26b ba71757
Author: Antony Antony <antony at phenome.org>
Date:   Fri Oct 24 05:45:31 2014 +0300

    Merge branch 'master' into hugh-2014oct
    
    Conflicts:
    	testing/pluto/interop-ikev2-strongswan-15-create_child_sa/east.console.txt
    	testing/pluto/interop-ikev2-strongswan-15-create_child_sa/west.console.txt

commit 636a26bb96b6f9e34b1cd35941c289267909820e
Merge: bb8cb0f dcbc538
Author: Antony Antony <antony at phenome.org>
Date:   Fri Oct 24 05:44:47 2014 +0300

    Merge branch 'hugh-2014oct' of vault.libreswan.fi:/srv/src/libreswan into hugh-2014oct

commit dcbc53881339ef9211037142bd31f12ae840fc33
Merge: 500f6f3 84dec05
Author: Antony Antony <antony at phenome.org>
Date:   Thu Oct 23 08:36:39 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit bb8cb0f4485e4e35f8e012e9471c697702911638
Author: Antony Antony <antony at phenome.org>
Date:   Thu Oct 23 06:35:04 2014 +0300

    testing: update interop-ikev2-strongswan-15-create_child_sa with ping

commit 500f6f3c2ac57bb29799ef7e5f104047e4a33eb3
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 22 15:54:43 2014 -0500

    ikev2: instantiate only if a connection is oriented
    improving commit ebd6cd053d5640538b02ebb74ab20c0ab7364f5a

commit 9609dcd51f48b1a0262daaf17643f70b65a5e941
Merge: c8af69f 3dc146f
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 22 12:47:46 2014 -0500

    Merge branch 'master' into hugh-2014oct
    
    Conflicts:
    	include/x509.h

commit c8af69fd187c29a8495dabc0af0ad0217ac94f11
Merge: b85a029 0e557f8
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 15 14:13:46 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit b85a029d5a3f1a95f0411cfbee6c41cdf78795d3
Merge: 2616362 3a34aee
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 15 14:13:22 2014 -0500

    Merge branch 'hugh-2014oct' of vault.libreswan.fi:/srv/src/libreswan into hugh-2014oct

commit 3a34aee91e009aa5c8a295e05e18de233df4f1d0
Merge: 0dbf056 6e228af
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Oct 19 02:22:13 2014 -0400

    Merge branch 'master' into hugh-2014oct

commit 0dbf05608147170a913b97fc2e3bef76daab4fe5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Oct 18 14:43:44 2014 -0400

    pluto: slight tidy

commit a22c591132590596ccd10b49d3b90968161e02ee
Merge: 4ec87e5 2a7905b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Oct 18 14:37:12 2014 -0400

    Merge branch 'master' into hugh-2014oct

commit 4ec87e57f24147901baa8e80e327f7f1a552c804
Merge: b0d40e2 f67c95a
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Oct 16 18:20:51 2014 -0400

    Merge branch 'master' into hugh-2014oct
    
    Conflicts:
    	programs/pluto/ike_alg_aes.c

commit 2616362390fb72e08defedd677f460d9731b2c86
Merge: 4ec87e5 d3a0a09
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 13 18:54:41 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit b0d40e2423e424c514475ad1f0ffe55345a8a06c
Merge: a03c282 9e55df4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Oct 6 11:11:12 2014 -0400

    Merge branch 'master' into hugh-2014oct

commit a03c282c6932ea8368cd3967b01bc1c5a683bf49
Merge: 2b4a3dc aa5a372
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Oct 5 23:48:15 2014 -0400

    Merge branch 'master' into hugh-2014oct

commit 2b4a3dc485e32aa8d7aa30ce113bee554d98564f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Oct 5 14:19:36 2014 -0400

    Cosmetic: fix spacing around * in declarations and ends of comments

commit 716b8b04cb2274e15d549d02ca0570ed12490cba
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Oct 5 14:18:01 2014 -0400

    lswconf.c: getNSSPassword: fix bugs and tidy
    
    - handle password not found case
    - eliminate a leak
    - avoid array overrun (more than one place)
    - use NULL, not 0, as null pointer constant
    - don't use a pointer in a boolean context
    - simplify, clarify, explicate

More information about the Swan-commit mailing list