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

[Paul Wouters]

New commits:
commit 9cbc0f00c7479175ae16fb99e749d054db1da53e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 23:40:28 2017 -0500

    testing: added basic-pluto-04

commit 2450e8b1013ea8923a2d83caaf0ce7ecb92508e6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 23:39:35 2017 -0500

    testing: add basic-pluto-04 to track bug from https://github.com/libreswan/libreswan/issues/126
    
    This shows a strange parser bug with respect to conn %default

commit 8a3f40d6cc494a8b02ceb57108cef40c2f033630
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 21:37:42 2017 -0500

    testing: added seccomp-03-updown

commit 2b7ad4446c350cd0245b3bbc73980a7a4ee6ef6e
Merge: 46b403e ae77193
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 20:50:35 2017 -0500

    Merge branch 'ipsecme-split-dns'

commit ae771938f0729f038519e638eddbdebeee951a0d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 01:16:42 2017 -0500

    fixups due to merge

commit 5ab454cbcd355ecbbe3086302b5e4362205e67c5
Merge: f8696cb 6eec5e1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 01:03:10 2017 -0500

    Merge branch 'master' into ipsecme-split-dns

commit f8696cb592671371c007a42bb9ad348df48c7fc2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Oct 30 10:08:35 2017 +0400

    pluto: clarify log msg

commit 40878ceaced8534e78040c6d213d0ba13391a6cc
Merge: 4080d6c 0fadce2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Oct 30 10:03:30 2017 +0400

    Merge branch 'master' into ipsecme-split-dns

commit 4080d6c4ca056917c4178141ee40085994542216
Merge: db9461f b281dfe
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 4 19:07:58 2017 -0400

    Merge branch 'master' into ipsecme-split-dns
    
    Conflicts:
    	lib/libwhack/whacklib.c
    	programs/pluto/ikev2_child.c
    	programs/pluto/ikev2_parent.c

commit b281dfef35afc569e201b12d33b496f9a4a5c084
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 3 11:01:59 2017 -0400

    documentation: fix name in changes file

commit db9461fc7018acd5af55f6ed95528ef341e8d004
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Feb 4 16:27:42 2017 -0500

    IKEv2: ignore DNS CP for Opportunistic connections

commit cb18d8d23f879cbdf8f0e22dc30073fa4996a5c9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Feb 4 15:43:19 2017 -0500

    IKEv2: set_ia / set_dns cleanup for address family and responder ignore

commit 984d836d4557ecfe38bc010091afa4b0c1c79dbb
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Feb 4 15:02:48 2017 -0500

    IKEv2: comment out IKEv2_INTERNAL_DNSSEC_TA - no early code point received yet

commit cbfe5607ea60ae5a3402a17326d44d9f5a92f396
Merge: e8117b3 f7b67d3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Feb 4 15:00:06 2017 -0500

    Merge branch 'master' into ipsecme-split-dns

commit e8117b3e0a70b2b3984b0f5662e75f5fd78fd3f7
Merge: 8215e4c b984461
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Oct 16 22:57:41 2016 -0400

    Merge branch 'master' into ipsecme-split-dns

commit 8215e4ca540b76f9b0adec0b39d856a4476bcf35
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Jul 17 01:30:58 2016 +0200

    WIP: implement draft-pauly-ipsecme-split-dns-01
    
    experimental for IETF96 interop testing with iOS
    
    currently hardcoded to two entries.
    Responder ignores Initiator optional values