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

Fri Jul 11 00:10:17 EEST 2014

New commits:
commit fab4ba45738b1fa2a049f5d612c143a4bfe181a0
Merge: 6200206 85f040d
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jul 10 17:08:50 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/pluto/ikev1_main.c

commit 6200206ecebd4fa267f27327894d226793ebbab0
Merge: 6fc7d34 0902f69
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jul 10 01:06:24 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 6fc7d3415fb010be9ba4801f70c2a647fc472d7c
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jul 10 01:05:06 2014 -0400

    fixes / tidying inspired by LLVM

commit 9934b4c0ae32b6388046234ff9054ac6e8a9b757
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Jul 9 15:53:30 2014 -0400

    obvious fixes provoked by LLVM warnings

commit 42e9750ccc7bd09298001c892ec1896a7e4e553e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Jul 9 15:27:33 2014 -0400

    parser.l: simplify use of GNU glob(3) extensions

commit 7f10addaf599aba7c315aa4e719c2ae056494f1e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Jul 9 15:12:55 2014 -0400

    adns.c: clearer whitespace

commit 9519bdf1f8b8a6b316d9d951800090f62b5c721f
Merge: 6b4d538 69fbb75
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Jul 9 15:06:29 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 6b4d53857cd6d33d1232c3ab788f62849a772d8f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jul 8 13:44:20 2014 -0400

    parse_ipsec_transform: clarify by replacing parameter is_ipcomp with parameter proto

commit 99e98cbb5729fbef22d5ae9f8eaa4b9362778716
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jul 6 01:12:46 2014 -0400

    Make crypto_req_keysize's ksproto arg an enum.  Tidy.

commit 485bcf0ec446135f3fbb1455bff50958f920c0ee
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jul 6 01:06:23 2014 -0400

    test wrong for "SA_LIFE_DURATION IPsec attribute not preceded by SA_LIFE_TYPE attribute"

commit d3d3df6562c91bba3abb4f454e9104b44e6c6d6a
Merge: 0643ed3 3b3fe8f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jul 6 00:07:50 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 0643ed3e2034aaadd8acede4dd9f0685e6552ea2
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 20:12:19 2014 -0400

    _stackmanager.in awk script:
    - fix indentation broken in d5a917623ce2fb58ca254dd9013c7c7a5532aa70
    - slight simplification

commit 4002d5a49a9d3d573e4bde85149c7913b949074e
Merge: 24fefa4 42abf27
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 19:05:39 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 24fefa4a9612a25b946f4a1b6279ad084f6a5ff5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 19:04:19 2014 -0400

    ikev2_evaluate_connection_fit: add a reference to the RFC

commit 71b8ddbfe3a20c01520a2f0bad4f8e4a765fc828
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 02:12:40 2014 -0400

    define and use startswith() and eat() for idiomatic uses of strncmp

commit c8def649154a1b5ac22610e169ef24664657c338
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 02:09:36 2014 -0400

    fix aalg_getbyname_ike bug: "n", "nu", and "nul" would spuriously match "null".

commit b2218df990f7a6006a45849e0e18d3828c18c1e3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 4 01:08:00 2014 -0400

    eliminate more strtoul(3) calls; make others more careful

commit 7832f812f5ea273f8881463b2467204032ad1be9
Merge: c37e60a a16cb63
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jul 3 18:01:11 2014 -0400

    Merge branch 'master' into hugh-2014may

commit c37e60ab0ee46f697e14b65383cfa19996a74692
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jul 3 18:00:11 2014 -0400

    improve comment

commit 0a4d35ce598faf3cdb7d0bed91a5a012428b5f50
Merge: fd0a5f2 6dd4892
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 24 21:05:16 2014 -0400

    Merge branch 'master' into hugh-2014may

commit fd0a5f26df7a9620d92c0afdba87a7852873b159
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 24 14:05:59 2014 -0400

    Fix misplaced zero() in nat_traversal_natd_lookup.
    Renamed nat_traversal_natd_lookup to ikev1_natd_lookup.
    Add natd_lookup_common with common code from
    nat_ikev1_natd_lookup and ikev2_natd_lookup
    so bugs only have to get fixed once.

commit 74ccd49b412b1c621818f4ce47b01f7d0acc2df1
Merge: 8e31dd9 d6d5301
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 24 13:27:46 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 8e31dd997af4eb1ad94953f3ea657a9fee3283bb
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 22 17:59:52 2014 -0400

    minor tidying

commit 7a93d85957429c4aa3df402a2ff1f5202c8625b0
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 22 17:59:39 2014 -0400

    simplify nat_traversal_natd_lookup

commit 376708f61e68964034a86ac82a8e65a9bf8f2e80
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 22 16:20:18 2014 -0400

    ikeping:
    - print the program name in each message
    - don't use continue when break is meant
    - handle unknown flags gracefully
    - detect and report internal error in flag processing

commit eb0d6a2cbbc483cba64ccc6ffbeb4751ed9ea8e9
Merge: de6599d 443e0cc
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 22 12:52:59 2014 -0400

    Merge branch 'master' into hugh-2014may

commit de6599d25ff5f08f89af0bf3d3807d4d32914765
Merge: b754253 38bb0ba
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 21 23:24:58 2014 -0400

    Merge branch 'master' into hugh-2014may

commit b754253d8667aa5cca18492ca959da5c837c01c7
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 21 23:16:17 2014 -0400

    Simplify safely printing IP addresses:
    
    - add ipstr (with ipstr_buf) as a re-entrant replacement for ip_str
    
    - add it in such a way that any of our code can use it:
      kernel or userland, programs or libraries, pluto or utilities,
    
    - remove ip_str (defined in odd places)
    
    - replace addrtot calls with ipstr calls wherever advantageous.
    
    - incidentally: tidy lots of adjacent code.

commit 40ae28220e5465adcd4a04f172d4baa958de2ed6
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 19 23:51:50 2014 -0400

    Separate ikev_idtype_names and ikev2_idtype_names.
    Separate ikev_cert_type_names and ikev2_cert_type_names.
    Make more strict -- only support values in standards.
    Reverses part of f58b43e2c3b4089445992d93e46407b8bd84339b

commit 82f004896565bd369acd01192e1a180283e81097
Merge: 439a744 375c75e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 19 23:51:14 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 439a744214665f808613a35a05b5ea4ac5678573
Merge: 839a6cc 6883fac
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 19 20:01:09 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Fix STF_TOOMUCHCRYPTO handling
    
    Conflicts:
    	programs/pluto/ikev2_parent.c

commit 839a6ccab9b50679546d48620d618992e6319ee4
Merge: 0e00834 eabebf4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 17 15:33:50 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Paul's df302ad73dad34cee4cd6a4ebffb9b7562dea082
    overlapped with Hugh's 0e00834183923af6209900f36839be3431ddfb09
    
    Conflicts:
    	programs/pluto/db_ops.c

commit 0e00834183923af6209900f36839be3431ddfb09
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 17 14:33:08 2014 -0400

    simplify and tidy db_ops.c:
    continue work of ad54b968198a3c59be6f61138441fc918f01289f

commit 2a3fcb79147cc08a4a661a8cd38f559e269ad92c
Merge: d9b454e 9497b44
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jun 17 14:31:01 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/pluto/db_ops.c
    	programs/pluto/db_ops.h
    	programs/pluto/ikev2_spdb_struct.c

commit d9b454ed6d24d95205813df7116149f1a2a01920
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jun 15 13:46:37 2014 -0400

    separate declarations from statements with a blank line

commit 4d989b11e0b43c80def708b392aa1a643362c524
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 14 22:13:52 2014 -0400

    packet.c: diplay the name for IKEv2 transform ID.
    This required adding a slightly baroque mechanism, ft_enum_enum.
    It may enable the removal of ad hoc checking code.

commit 54e1a7c1f155ed36276d768e5f5447be4699b4a3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 14 22:10:44 2014 -0400

    Try to correctly model v2 Transform Attribute Types.

commit d53e42bbff14b52f921c3111834cfa33e9279a7d
Merge: 448d8a6 7ddf25f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 14 21:23:22 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 448d8a61b93b7fbe87c01b711dab88403203b04e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jun 13 19:39:37 2014 -0400

    respect the type system.
    - use PROTO_v2_* in ikev2 code.  Gave up part way through because it is quite a mess.
    - replace 0 by OAKLEY_GROUP_invalid where appropriate
    - replace 0 with PROTO_v2_RESERVED where appropriate
    - replace u_int16_t with enum ikev1_oakley_attr where appropriate
    - replace u_int8_t/int with enum next_payload_types_ikev1 where appropriate
    - replace u_int8_t/unsigned int with enum next_payload_types_ikev2 where appropriate
    - replace u_int16_t with v2_notification_t where appropriate
    - replace int with enum ikev2_trans_type_integ where appropriate
    - replace int with enum enum ikev2_trans_type_prf where appropriate
    - replace u_int8_t with enum ike_cert_type where appropriate
    
    - simplify code to eliminate variables
    - renamed process_informational_ikev2 => process_encrypted_informational_ikev2
    - eliminated some tests for payloads that are redundant due to state microcode

commit 0af78a72f8543072f631adb973301c35b987b980
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jun 13 11:29:36 2014 -0400

    - move common code into start_dh_v2
    - delete commented-out code dealing with encrypt_algo
    - rename "init" to "role" many places where appropriate
      (and delete associated outdated and unclear comments)
    - change type u_int16_t => oakley_group_t where appropriate

commit 46d1a638fd069d59694a18dee96b53c581ce09ec
Merge: a124bd2 128fd89
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jun 13 09:36:36 2014 -0400

    Merge branch 'master' into hugh-2014may

commit a124bd268b25103df9719efc06762c809aed3730
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 12 16:04:53 2014 -0400

    tidy; get rid of some gotos

commit a459008064741d14c032ecc9f57b78be68a19d3b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 12 13:32:55 2014 -0400

    A FOR statement with an empty body is hard to read.  Use "continue" as body.

commit 3d591e0d425e5670411b35c8dd0bb2d5c43f964d
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 12 13:31:09 2014 -0400

    in each v2 microcode entry, make timeout_event explicit