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

[Paul Wouters]

New commits:
commit 35ae3730c390f520611a55414aaba52a16dbe971
Author: Daiki Ueno <dueno at redhat.com>
Date:   Mon Jul 19 18:52:28 2021 -0400

    pluto: split IKEv2 ipseckey out DNS query code into a separate file
    
    When compiled with DNSSEC support, <ldns/ldns.h> indirectly pulls in
    OpenSSL headers where symbols conflicting with the ones defined in NSS
    headers, such as KU_* macros.  This moves out the low-level DNS lookup
    code using LDNS to a dedicated file, so there will be no interference.
    
    Signed-off-by: Daiki Ueno <dueno at redhat.com>
    Co-authored-by: Paul Wouters <paul.wouters at aiven.io>

commit a1ae405a6385bc49ac2045ed15be1cff486f265d
Author: Paul Wouters <paul.wouters at aiven.io>
Date:   Mon Jul 19 17:36:01 2021 -0400

    pluto: Fix compileing with USE_IKEv1=false
    
    This fixes:
    
       commit 8c8ebf98d "ikev1: sprinkle _V1_ over IKEv1 specific IS_*() macros"