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

[D. Hugh Redelmeier]

New commits:
commit 0b02970b724d939cc804edb09bc8ea62ff9d3302
Merge: 37a7917 08fac47
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Nov 19 01:14:31 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit 37a791774359feec6360b931822defe36405dd5f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Nov 11 16:48:43 2014 -0500

    fallout from renaming secctx-attr-value => secctx-attr-type
    
    (Mostly fixing testing reference files and sanitizer scripts)

commit 73686063d3b69b21f1620bd1ce2354623f35bf83
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Nov 10 02:15:09 2014 -0500

    pluto: add new file programs/pluto/labeled_ipsec.h

commit e1ee0607635f280943107cde8f96e8245e5eaca4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Nov 10 00:45:48 2014 -0500

    pluto: major tidy of labeled ipsec code
    
    - rename secctx_attr_value => secctx_attr_type because that is more accurate
    
    - rename conf keyword secctx-attr-value => secctx-attr-type for same reason
      Updated documentation.  Old names still work.
    
    - remodularize: move include/packet.h to programs/pluto/packet.h
      but break out the part used by ikeping.c into a new header,
      include/isakmp_hdr.h
    
    - add const attribute to many parameters carrying labels
    
    - use in_struct and out_struct for Security Context Labels in IKE
      packets.  Much more concise and careful than hand-marshalling.
    
    - in netlink Acquire handling, accept more general structure of the
      message.  Fix a leak too.
    
    - extensively check Security Context Labels on their way in via IKE
      and netlink.
    
    - add clarifying comments and comments noting puzzles
    
    - fix formatting and grammar

commit 6ab2f6da4d25702560a6eea112bc69cb54661d5a
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Nov 3 01:26:48 2014 -0500

    pluto: improve parsing of SECCTX attribute

commit d89a6b46882d92523480b5502a80e7f5c8a2889e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Nov 3 00:46:29 2014 -0500

    pluto: improve whitespace in HAVE_LABELED_IPSEC code

commit 0afee0b7c6f1a4df14aebc10007e7181f4ac1dcd
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 2 23:13:19 2014 -0500

    pluto: fix fixes for reference to uninitialized fields in output struct
    
    The was fixed in 459757b3e33a2e73454575fb2cee389414f02e87 zeroing the structs.
    Unfortunately, this just hides bugs.
    
    This patch fixes the two cases (bugs!) where uninitialized fields were used:
    out_attr and its clone ikev2_out_attr.  These were actual bugs and the zero
    just hid them.
    
    The length member of an output struct need not be initialized.  This
    is made more plain by the recent change to out_struct.
    
    Improve or add a few comments.

commit 9504fc60e4483abe022894ce5f7681a2d3d6f8ba
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 2 23:02:34 2014 -0500

    pluto: rejig out_struct so length fields of the struct are never referenced
    (They are to be computed, but the code fetched and ignored the value in the struct.)

commit 5ba0845ceec81b3cd0fea9b6387664649a3f563b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Nov 2 22:54:28 2014 -0500

    pluto: remove scary union trick from reference counting of struct alg_info

commit 51d2c045b07a377febf6224e1197efefc14830f0
Merge: 696c90d 84a94a8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Nov 10 01:24:37 2014 -0500

    Merge branch 'master' into hugh-2014oct

commit 696c90d033b16147a31f0642a467b6690b5743e6
Merge: c2dc2cf 8f48b8c
Author: Antony Antony <antony at phenome.org>
Date:   Sat Nov 1 05:44:04 2014 -0400

    Merge branch 'master' into hugh-2014oct