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

[Paul Wouters]

New commits:
commit 53ba1aa91994e4d95e614275620dac1cd19505e0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jun 10 15:06:53 2017 -0400

    updated changes

commit d7d2f8cfb588d4f7f49e1072263ef077759c7fb2
Merge: 4391bc8 8ee5a59
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jun 10 15:05:58 2017 -0400

    Merge branch 'klips-get_sa_info'

commit 8ee5a599cf3bebe4c56bb6ac9677cd93d33962f5
Merge: bb40b39 818e8d1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jun 10 11:53:51 2017 -0400

    Merge branch 'klips-get_sa_info' of https://github.com/rgbriggs/libreswan into klips-get_sa_info

commit 818e8d1f2e391cca522ced03862e397946e5d012
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sat Jun 10 11:21:29 2017 -0400

    pfkey: make sa and lifetime parser size error text consistent with rest
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 32676e03fa0db48e373987a00e1322b89e36ab95
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sat Jun 10 10:56:30 2017 -0400

    pfkey: disable lifetime packet extension until kernel supports it
    
    The userspace pfkey library was unable to parse the lifetime extension
    generated in the kernel due to the userspace pfkey library having a
    non-standard extension sadb_x_lifetime_packets added to the struct
    sadb_lifetime, making the packet from the kernel 8 bytes shorter than expected.
    
    Disable it for now.
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 0826052da51e56dfb05a89b40d412ab850f3f023
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sat Jun 10 09:36:29 2017 -0400

    pfkey: make pfkey_v2_parser readable again
    
    Take 92eb4c7 ("more tidying of timer.c") further in bringing back sanity from
    the damage of 6fa8170 ("Change coding style to Linux kernel").
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 708917db839d9945e0a2cade365d43544de1191b
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Fri Jun 9 21:07:27 2017 -0400

    pfkey: permit lifetime current extention in
    
    On GET_SA_INFO for KLIPS making a SADB_GET call, the reply (IN) must be
    permitted to receive a SADB_EXT_LIFETIME_CURRENT extension.
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit bb40b3964f216b9e4cbe41104cd1a848125f0147
Merge: d034887 4391bc8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jun 9 14:50:31 2017 -0400

    Merge branch 'master' into klips-get_sa_info

commit d0348879cdf57fb7883177c6c290e1f2925c9900
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 22:55:28 2017 +0530

    pluto: add support for get_sa_info() for klips and mast
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 0d32e242a6a2d9984214850247b3b7a46a5e8aeb
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 21:57:43 2017 +0530

    spi: add SADB_GET support to retrieve current lifetime stats
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit f20103165fbe764f29a37a27aca15aea35a8c006
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 21:50:57 2017 +0530

    pluto: add missing param self-documentation for netlink_get_sa()
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 9f56cdef5e57cf4ae733f82da995a6eb8bf36d70
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 21:45:24 2017 +0530

    klips: check SADB_GET message for valid satype/proto
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit c7e5c74fa84f7e6a274eead49e77393fdf0f8704
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 20:30:34 2017 +0530

    ipsec_alg: move XF_OTHER_ALG def to header with other macros to avoid surprise
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>

commit 2b930e0cdce74ef87a6dd77d0a07d214dc65bb9b
Author: Richard Guy Briggs <rgb at tricolour.ca>
Date:   Sun Apr 16 20:27:24 2017 +0530

    Makefile: fix tags path for KLIPS source files
    
    Signed-off-by: Richard Guy Briggs <rgb at tricolour.ca>