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

[D. Hugh Redelmeier]

New commits:
commit d9e8d38a74079f9f7abe96eafb728d0274413515
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 14 17:45:31 2015 -0400

    programs/pluto/ikev2_parent.c: fix CONFLICT missed in last merge

commit cb00028e19b81014c5f98705c70568742416b6b1
Merge: f1c5435 8495e0c
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 14 17:44:14 2015 -0400

    Merge branch 'master' into rfc7383
    
    Conflicts:
    	programs/pluto/ikev2_parent.c

commit f1c543526868d52719fcca392f56fb5c03cfb6e6
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 14 17:38:52 2015 -0400

    pluto: various fixups associated with RFC 7383 code
    
    - ikev2_send_fragment now uses its own buffer for fragment
      rather than (dangerously) using global reply_buffer.
      Change callers to no longer stash reply_buffer contents
      on heap.
    
    - ikev2_record_fragments: fix slightly dangerous calculation of number
      of fragments.
    
    - rename SMF2_REPLY to SMF2_SEND to better reflect its meaning
    
    - use SMF2_SEND for created state (ikev2_parent_firststate_microcode)
    
    - adjust success_v2_state_transition's SMF2_SEND code to avoid
      redundant heap allocation
    
    - add and use PMIN and PMAX macros
    
    - use "chunk_t" rather than "struct chunk"
    
    - tidy
    
    - Paul: changes to testing/pluto/ikev2-major-version-responder/west.conf

commit 96c064903d17ecd384f5776bd61cbaafc2c1b71b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 13 23:02:25 2015 -0400

    fix merge 6f0dfa129e35e2360b20fc8956479007ec71d246

commit 6f0dfa129e35e2360b20fc8956479007ec71d246
Merge: 8a38000 910250f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 13 20:15:44 2015 -0400

    Merge branch 'master' into rfc7383
    
    Conflicts:
    	programs/pluto/ikev2.c

commit 8a3800056c5f4d3d3339e30c2bad432bd951cbaa
Merge: cedc823 b9a20bd
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 9 01:01:24 2015 -0400

    Merge branch 'master' into rfc7383

commit cedc8238bcf6e4ced1893acc2dc8afd83f93fce2
Merge: b810f4d d93deab
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Jun 8 23:08:52 2015 -0400

    Merge branch 'master' into rfc7383

commit b810f4d80400dcebec7e1611d5816f6215a945b2
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 7 17:24:54 2015 -0400

    pluto: attempt to condition in fix should_fragment_ike_msg

commit 0bcaf4cf61ba2d21a3fb54332f6696c89f4b4ff3
Merge: 6e43a27 3869066
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 7 17:18:03 2015 -0400

    Merge branch 'master' into rfc7383
    pluto: tricky merge
    - release_v2fragments changes overlapped with record_outputnd_ike_msg
    - should_fragment_ike_msg may have a bug
    Conflicts:
    	programs/pluto/ikev2_parent.c
    	programs/pluto/server.c

commit 6e43a275dc2a47fa881dba455b2586548284b9d8
Merge: e04c4f4 3966853
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 4 14:37:42 2015 -0400

    Merge branch 'master' into rfc7383

commit e04c4f48ff96b569a1885fea469676f8b0f99d49
Merge: 58c0fe5 e82a598
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 1 16:36:20 2015 -0400

    Merge branch 'master' into rfc7383

commit 58c0fe5af5082aa071e6db81bfb29c900bda48ad
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 8 17:22:28 2015 -0400

    pluto: change fragmentation logging to avoid DOS attaccks

commit d89242bf03199cbb42ad1fb2479ebe8cd7880e85
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 8 17:13:44 2015 -0400

    pluto: sync up on new IANA values

commit 4e15522ff3cbc760199d7ef134809d4e6a59fc22
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Fri May 8 16:56:07 2015 -0400

    pluto: adds RFC-7383 IKEv2 fragmentation support