[Swan-commit] Changes to ref refs/heads/hugh-wip

[D. Hugh Redelmeier]

New commits:
commit d2a39e59a145ee183bfa9b1ed749c95047a9f322
Merge: 6e1587c 3fd4906
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Nov 1 16:14:21 2013 -0400

    Merge branch 'hugh-wip' of vault.libreswan.org:/srv/src/libreswan into hugh-wip

commit 6e1587c08f1c2cf45fe65069f47bf0b74360fae3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Oct 31 02:19:37 2013 -0400

    - delete programs/pluto/ikeping.c: its exports were not used
    - C programmers should not normally define identifiers with a leading underscore
    - make more things static
    - undo some bad uncrustification
    - simplify and clarify some code

commit fb9fe2c444df6d75b7f883b9eb9015d903e4b659
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Oct 30 16:38:11 2013 -0400

    - make more things file static
    - rationalize placement of declarations
    - delete vestigial programs/pluto/ike_alginit.c
    - eliminate a couple of GOTOs
    - eliminate race-like bug in programs/pluto/ike_alg_status.c

commit 5f80ab1a69f7fdfd3a361a512c2daee759f6ffe3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 19:25:42 2013 -0400

    - make more things in secrets.c and fetch.c file static
    - delete some unused declarations
    - #if-out lsw_has_private_key because it is unused

commit 4f8e3e8e059cbdb0d82cb738611c49e5348e69f6
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 17:05:06 2013 -0400

    - Add copyright notice to dpd.h (just a copy from dpd.c)
    - ditch unconventionally placed and unnecessary declaration of was_eroute_idle
    - make p1_dpd_outI1 file static

commit b3e03fba2fc31bdc07ec1d0ad7855c80c3513e82
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:57:22 2013 -0400

    - move declaration of adns_reapchild to dnskey.h from server.h
    - deleted from server.h declarations of functions that no longer exist

commit 260c9db3f5a5fe89c7b4f9ac9f6958b80d2a9ea9
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:39:14 2013 -0400

    delete unused cmp_chunk from defs.c

commit 1b9e6339ab94770f8e4a179d5f609be7286aab83
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:35:26 2013 -0400

    make a few more things file static in connections.c

commit 032416b3a1f8dee8b4cbbd6a26141455fca89be5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:17:35 2013 -0400

    make eof_from_pluto file static

commit d6b8ca60af9e5c2e963e23ae8edca1ecd6adb481
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:14:49 2013 -0400

    make empty_ac file static

commit 3ef006620f26b5572565ae65d1926b74cabc2824
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 11:03:08 2013 -0400

    - fix typing of for_each_state
    - fix some uncrustify damage
    - reduce scope of some local variables
    - remove some unnecessary IFs
    - factored out child-killing code in ikev2_parent.c
    - fix very bad assumption that all states on hash chain must be children of same parent
    - added comment to explain state table better in state.c
    - factored out common code in state.c for removing a state from the state table

commit 25ffc715b845499f5b46d9afb77f6a3b8f9c15ac
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 11:00:47 2013 -0400

    add note about v2 calling cookies IKE SA SPIs in description of ISAKMP header

commit 3f1fbb25fe8d50a31b4fc54b36124e444a5e591b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 10:55:50 2013 -0400

    - make more spdb things file static
    - local code clarification
    - improve some comments
    - fix some uncrustify damage

commit ad1a8e028f8c514b7917dfdc6a64047970735159
Merge: 6868576 2249af3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Nov 1 09:50:07 2013 -0700

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

commit 68685769da2bca1391e11da2b6732f9ea4300fa4
Author: Roel van Meer <roel.vanmeer at bokxing-it.nl>
Date:   Fri Nov 1 09:45:06 2013 -0700

    KLIPS: NEED_UDP_ENCAP_ENABLE needed for 3.5+, not3.4
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit c95bf60cc3af6c9f691d08518f40f9a65f327f0e
Author: Roel van Meer <roel.vanmeer at bokxing-it.nl>
Date:   Fri Nov 1 09:42:51 2013 -0700

    building: support for slackware version/init system detection
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit 2249af340768f5486ec4ecbd33b06212f032f0f1
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Nov 1 09:00:41 2013 +0200

    CHANGES: fix release data of v3.6

commit 2c75abedacdeaacbb2f24633f564b52a3c18b09b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 22:46:36 2013 -0400

    updated changes

commit a9ddf554d2e01c78959e61fc0c880b5818ca32c7
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 22:43:59 2013 -0400

    ikev2: Fix ikev1 fallback when ikev2 fails
    
    Confirmed by testcase ikev2-01-fallback-ikev1

commit 417ca2008167bd463a6ff8128b3488b25682d8fb
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 22:42:15 2013 -0400

    testing: updated ikev2 test cases

commit 4986e9d210a3ba7633f0b569599d4905831d6bb6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 12:48:56 2013 -0400

    testing: various ikev2 output updated

commit aba926bbcda1c1a6e36f4e9639073f92ce960e6f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 11:50:52 2013 -0400

    pluto: disentange ikev2 transform from ikev2 next payload type

commit d576593a3259c5bd8ac5d7cedb39122eb93514c0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 11:47:21 2013 -0400

    ikev2_x509: disentange an ikev1 value for an ikev2 value
    
    We conditionally used ISAKMP_NEXT_CR (7) instead of
    ISAKMP_NEXT_v2CERTREQ (38)
    
    This could have caused us to fail to ask the remote for an x.509 certificate.

commit 3b98fdaa34bcb5d18be0ffed736687ebbeea1435
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 30 11:46:48 2013 -0400

    ikev2: fixup a use of ISAKMP_NEXT_NONE to ISAKMP_NEXT_v2NONE

commit a07cb292f53628608cb850058ac98b86c4e4f069
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 29 17:56:55 2013 -0400

    pluto: disentange ikev2 proposal from ikev2 next payload type
    
    Don't re-use IKEv1 values. Introduced ikev2_last_proposal_names
    to distinguish these from ikev1 next_payload_type