diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index dd0509e..956ac75 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -80335,7 +80335,7 @@ index 1f81d830e7..4b9893388b 100644 bool mf_is_set(const struct mf_field *, const struct flow *); void mf_mask_field(const struct mf_field *, struct flow_wildcards *); diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in -index 37e3703245..668507fd37 100755 +index 37e3703245..41ef886194 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -14,6 +14,7 @@ @@ -80387,6 +80387,28 @@ index 37e3703245..668507fd37 100755 """ % (FILE_HEADER) CONF_HEADER = """%s +@@ -193,18 +202,18 @@ conn prevent_unencrypted_vxlan + """ + + auth_tmpl = {"psk": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + authby=psk"""), + "pki_remote": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + leftid=$local_name + rightid=$remote_name + leftcert=$certificate + rightcert=$remote_cert"""), + "pki_ca": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + leftid=$local_name + rightid=$remote_name @@ -246,7 +255,7 @@ conn prevent_unencrypted_vxlan proc = subprocess.Popen([self.IPSEC, 'status'], stdout=subprocess.PIPE) @@ -80396,6 +80418,20 @@ index 37e3703245..668507fd37 100755 if line == '': break tunnel_name = line.split(":") +@@ -290,11 +299,11 @@ conn prevent_unencrypted_vxlan + + def config_tunnel(self, tunnel): + if tunnel.conf["psk"]: +- self.secrets_file.write('0.0.0.0 %s : PSK "%s"\n' % ++ self.secrets_file.write('%%any %s : PSK "%s"\n' % + (tunnel.conf["remote_ip"], tunnel.conf["psk"])) + auth_section = self.auth_tmpl["psk"].substitute(tunnel.conf) + else: +- self.secrets_file.write("0.0.0.0 %s : RSA %s\n" % ++ self.secrets_file.write("%%any %s : RSA %s\n" % + (tunnel.conf["remote_ip"], + tunnel.conf["private_key"])) + if tunnel.conf["remote_cert"]: @@ -340,7 +349,7 @@ conn prevent_unencrypted_vxlan # about possibility of ovs-monitor-ipsec to block for each tunnel # while strongSwan sends IKE messages over Internet. diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 9acc87b..e4adeb1 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 145%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 146%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -712,6 +712,12 @@ exit 0 %endif %changelog +* Fri Jan 21 2022 Open vSwitch CI - 2.13.0-146 +- Merging upstream branch-2.13 [RH git: 0b2dac74a2] + Commit list: + 0df41e29b2 ovs-monitor-ipsec: Fix generated strongSwan ipsec.conf for IPv6. + + * Thu Jan 20 2022 Open vSwitch CI - 2.13.0-145 - Merging upstream branch-2.13 [RH git: 035f2095f9] Commit list: