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

[Paul Wouters]

New commits:
commit aa8062ed6bcd4e4a5ee516d8389beaba7b606507
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 26 19:40:39 2013 -0500

    update changes

commit 0342fcc294599fb419478eea20680911521798f6
Merge: dc2fb3d 677f256
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 26 19:36:57 2013 -0500

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

commit dc2fb3db2902d1a6d9c5fd566bfc016d8f019564
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 26 19:36:34 2013 -0500

    Comments: Clarified some IKEv2 delete SA code

commit 677f2565d920c6ed171130544a14c2cfc8b6022a
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Nov 26 19:10:48 2013 -0500

    v2_delete_my_family: fix assertion mistake

commit 8f9e0345f3cc546a9d235d1ba6139098d0959a07
Merge: 05ebb0e daf45e1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 26 14:14:06 2013 -0500

    Merge branch 'master' into hugh-wip
    
    Conflicts:
    	lib/libswan/lswconf.c

commit 05ebb0eb2493f9c8d6473d996c6732e765177bd7
Merge: 7db45e3 6561b56
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 26 13:57:54 2013 -0500

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

commit 6561b56a268109693a1e9305a5f14757e4bd0f21
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Nov 14 00:25:04 2013 -0500

    make constants.h definition of bool conditional so as not to clash with libreswan.h
    The definition ought to live one place.

commit 0e16cb3f6c444ea9db2d139cd084681219fad0f9
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Nov 13 23:48:31 2013 -0500

    dodge differences between bison 2.5 and bison 2.6 output

commit be42bab8d9cd1e5ada74ab6156d33063dfd52da5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Nov 13 22:12:46 2013 -0500

    prevent double inclusion of partser.tab.h

commit 7db45e3b2c134328dfd2c8e48d99c16566471787
Merge: 60203fa d118cb6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Nov 10 06:16:53 2013 -0800

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

commit d118cb69862ae1689fabcc80290b01b89c612a82
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 10 01:39:57 2013 -0500

    rejig parser header files to improve modularity

commit a0618cc569a87e6e117b81fbb9df5e436fa04bdd
Merge: 805ff7c 1c2e01a
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Nov 9 17:45:32 2013 -0500

    Merge branch 'master' into hugh-wip

commit 60203fa0feba9942b1bb97a126bec46b658e5e59
Merge: 2120485 1c2e01a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 9 10:24:42 2013 -0800

    Merge branch 'master' into hugh-wip

commit 2120485cc9f72bf7f825f929cd1f42471e553369
Merge: c47e8e7 805ff7c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 9 10:24:35 2013 -0800

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

commit 805ff7c15f3618c6c8ca7c8c20d5af86a5aa6c8d
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Nov 8 02:43:26 2013 -0500

    Better modularity discipline
    
    - add -Wmissing-declarations to warn when an external is being defined
      without a declaration.  Each external should be declared in exactly one
      header and this catches most failures.  It also catches some things that
      should be file static.
    
    - added -Wredundant-decls to catch things declared twice.
      Oddly enough our code base did this.  A bad sign of
      "who knows where this belongs?".
    
    - added -Wnested-externs to catch extern declarations
      inside blocks.  These are legal but bad form.
    
    - made many changes to fix the things caught by these tools
    
    - eliminated NO_DEBUG.  This required some fancy work with
      exit_tool declarations and definitions.  I'd like to
      eliminate it but it is used in testing/ in a way I don't
      understand.
    
    - deleted some unused functions (discovered when converted to file static)
    
    - fixed declarations "liberswan*" to "libreswan*"
    
    Still to do:
    
    - still some mess due to the ill-disciplined nature of declarations
      generated by bison and flex.  We can do better, but I haven't
      gotten there.
    
    - further progress towards a one-to-one correspondence between .h and .c
      files.
    
    - discover unused externals

commit c47e8e7b1c4bc6f468b81e184278ffce9ffe422c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 2 23:12:39 2013 -0700

    fix two #if's to #ifdef's. Although both are dead code.
    
    The confread one is an extra debug one could enable.
    The PFKEY_PROXY one I'm not sure if that has ever been used for anything.

commit 91118b70f0ec39f9e79680b445a05b548f690747
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 3 01:04:04 2013 -0500

    changes inspired by warnings generated by -Wshadow

commit 4ed267fbc56cf2904a3a9c100c00f53b6c7361ed
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 3 01:02:37 2013 -0500

    make crypt_mutex file static

commit 8e2ced0391a7ad70333b8183830f6a99371626ff
Merge: ffeaeda 5198a7f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 2 13:11:40 2013 -0700

    Merge branch 'hugh-wip' of vault.libreswan.org:/srv/src/libreswan into hugh-wip
    
    Conflicts:
    	lib/libswan/constants.c

commit 5198a7fc439dd6fbeb6c8a9b323eb93b54140c71
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Nov 1 17:28:27 2013 -0400

    trim trailing whitespace that has crept in

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 ffeaeda5cdfce731918677d2d9b368eca4dc6d5f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Nov 1 00:56:07 2013 -0400

    clean up enum and set printing
    - make non-re-entrancy warnings clearer
    - added re-entrant enum_showb
    - use enum_showb to fix enum_show usage bugs
    - added strip_prefix and used it to fix hacks
    - removed pointless NULL entries in name tables
    - marked NULL terminators of bitnamesof tables
    - tidy

commit 1ba6cdd52dcee32105fde939c031440e471c8cce
Merge: 51cfae7 3fd4906
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Oct 31 21:26:37 2013 -0400

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

commit 51cfae760bd5561bf0d4ee8e3a27e57f4770df6f
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 07bb55cb50826511f2cea445288a284d5e0ce4ee
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 c4710e706510cc36fc71d421c38a09dbb0d0b335
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 a3ab0b2014b3be08ee29c328e81bae9fe99b5848
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 7413b2c222780f8d9041a25ab6c82213750ad489
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 3178ca5a1b4fb98ce173609638d7fe99345b6260
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 6a275f534b93b0e9e7fd4d89222a65d794b59d52
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 8796bc9e52b8405fe484dbf1b182dd5fda674154
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:17:35 2013 -0400

    make eof_from_pluto file static

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

    make empty_ac file static

commit 36ccd7b0fce35be88bca6d75632066c6620b4d90
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 45c5083d1351fb8d1da8c0b2fc772e1b0136591e
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 07c7ac8ab714c04ec7bfa0720976e5dec3657f62
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 3fd49060a2278d14373ba873a5b3b22ae7b7f314
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 20b6558b93a47aa6fead62b6a53bdf629cec0b4e
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 ed0f4115d59c0655d13a422f35945743cf538470
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 2f2cfcfb2414e5faa69cf8e52dbca9f85d010852
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 273c076ba18b55477d1e08b70fb6e46fdecf568f
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 f5bf57a71d66d635116bc2f016d326e8ba8b1c4e
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 abc2131b8abd93a3b5d648ae1a84802ade085c37
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 92d59ab17bfb0390ff3d118e90c6a1acf88495a3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 29 15:17:35 2013 -0400

    make eof_from_pluto file static

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

    make empty_ac file static

commit 7ef370e218dda30bd592bfae4504ed4ca784e017
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 c97474d1233da80ad673c1aa0595b6a167159113
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 82c00d5ded0218dec53b0c11f95948bf9d35a691
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