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

[Paul Wouters]

New commits:
commit 15432bada468d7294d491144ded28e31d20b87e4
Author: Timm Baeder <tbaeder at redhat.com>
Date:   Fri Jan 15 12:57:15 2021 -0500

    libswan: Avoid adding integers to strings
    
    Although a common C idiom, clang warns about this:
    
    lib/libswan/jam_nss_ckf.c:36:2: error: adding 'unsigned long' to a string does not append to the string [-Werror,-Wstring-plus-int]
            FLAG(CKF_SIGN);
            ^~~~~~~~~~~~~~
    lib/libswan/jam_nss_ckf.c:32:30: note: expanded from macro 'FLAG'
                    size += jam_string(buf, #F + strlen("CKF_"));   \
                                            ~~~^~~~~~~~~~~~~~~~
    
    Fix this by using an array index instead.
    
    Resolves: https://github.com/libreswan/libreswan/pull/395
    
    Signed-off-by: Andrew Cagney <cagney at gnu.org>
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit 407da9a2ff5c1971704e44a86de2228d01183bf9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jan 13 21:59:04 2021 -0500

    whack: remove obsolete --labeledipsec option from help output