2021-05-18 06:45:49 +00:00
|
|
|
diff -Naur libreswan-4.3-orig/configs/d.ipsec.conf/ikev2.xml libreswan-4.3/configs/d.ipsec.conf/ikev2.xml
|
|
|
|
|
--- libreswan-4.3-orig/configs/d.ipsec.conf/ikev2.xml 2021-02-21 12:03:03.000000000 -0500
|
|
|
|
|
+++ libreswan-4.3/configs/d.ipsec.conf/ikev2.xml 2021-02-21 12:33:36.226284499 -0500
|
2020-11-03 12:02:35 +00:00
|
|
|
@@ -1,15 +1,15 @@
|
2019-11-05 18:48:41 +00:00
|
|
|
<varlistentry>
|
|
|
|
|
<term><emphasis remap='B'>ikev2</emphasis></term>
|
|
|
|
|
<listitem>
|
|
|
|
|
-<para>Whether to use IKEv1 (RFC 4301) or IKEv2 (RFC 7296) settings to be used.
|
|
|
|
|
-Currently the accepted values are <emphasis remap='B'>no</emphasis>(the default),
|
|
|
|
|
-signifying only IKEv1 is accepted, or <emphasis remap='B'>yes</emphasis>,
|
|
|
|
|
+<para>Wether to use IKEv1 (RFC 4301) or IKEv2 (RFC 7296) as the Internet Key Exchange (IKE) protcol.
|
|
|
|
|
+Currently the accepted values are <emphasis remap='B'>no</emphasis> (or <emphasis remap='B'>never</emphasis>)
|
|
|
|
|
+signifying only IKEv1 is accepted, or <emphasis remap='B'>insist</emphasis>(the default),
|
|
|
|
|
signifying only IKEv2 is accepted. Previous versions allowed the keywords
|
|
|
|
|
-<emphasis remap='B'>propose</emphasis> or <emphasis remap='B'>permit</emphasis>
|
|
|
|
|
-that would allow either IKEv1 or IKEv2, but this is no longer supported. The
|
2020-11-03 12:02:35 +00:00
|
|
|
-permit option is interpreted as no and the propose option is interpreted as
|
|
|
|
|
-yes. Older versions also supported keyword
|
|
|
|
|
-<emphasis remap='B'>insist</emphasis> which is now interpreted as yes.
|
2019-11-05 18:48:41 +00:00
|
|
|
+<emphasis remap='B'>propose</emphasis>, <emphasis remap='B'>yes</emphasis> or <emphasis remap='B'>permit</emphasis>
|
|
|
|
|
+that would allow either IKEv1 or IKEv2, but this is no longer supported and both options
|
|
|
|
|
+now cause the connection to fail to load. <emphasis remap='B'>WARNING:</emphasis> This behaviour differs from upstream
|
|
|
|
|
+libreswan, which only accepts <emphasis remap='B'>yes</emphasis> or <emphasis remap='B'>no</emphasis> where yes means
|
|
|
|
|
+the same as insist.
|
|
|
|
|
</para>
|
|
|
|
|
</listitem>
|
|
|
|
|
</varlistentry>
|
2021-05-18 06:45:49 +00:00
|
|
|
diff -Naur libreswan-4.3-orig/lib/libipsecconf/confread.c libreswan-4.3/lib/libipsecconf/confread.c
|
|
|
|
|
--- libreswan-4.3-orig/lib/libipsecconf/confread.c 2021-02-21 12:03:03.000000000 -0500
|
|
|
|
|
+++ libreswan-4.3/lib/libipsecconf/confread.c 2021-02-21 12:37:43.138031929 -0500
|
|
|
|
|
@@ -1310,11 +1310,17 @@
|
|
|
|
|
|
|
|
|
|
switch (conn->options[KNCF_IKEv2]) {
|
|
|
|
|
case fo_never:
|
|
|
|
|
- case fo_permit:
|
|
|
|
|
conn->ike_version = IKEv1;
|
|
|
|
|
break;
|
2019-11-05 18:48:41 +00:00
|
|
|
|
2021-05-18 06:45:49 +00:00
|
|
|
+ case fo_permit:
|
|
|
|
|
+ starter_error_append(perrl, "ikev2=permit is no longer accepted. Use ikev2=insist or ikev2=no|never");
|
|
|
|
|
+ return TRUE;
|
|
|
|
|
+
|
|
|
|
|
case fo_propose:
|
|
|
|
|
+ starter_error_append(perrl, "ikev2=propose or ikev2=yes is no longer accepted. Use ikev2=insist or ikev2=no|never");
|
|
|
|
|
+ return TRUE;
|
|
|
|
|
+
|
|
|
|
|
case fo_insist:
|
|
|
|
|
conn->ike_version = IKEv2;
|
|
|
|
|
break;
|
|
|
|
|
diff -Naur libreswan-4.3-orig/programs/whack/whack.c libreswan-4.3/programs/whack/whack.c
|
|
|
|
|
--- libreswan-4.3-orig/programs/whack/whack.c 2021-02-21 12:03:03.000000000 -0500
|
|
|
|
|
+++ libreswan-4.3/programs/whack/whack.c 2021-02-21 12:39:27.066188354 -0500
|
|
|
|
|
@@ -801,7 +801,7 @@
|
|
|
|
|
{ "ikev1-allow", no_argument, NULL, CD_IKEv1 + OO }, /* obsolete name */
|
|
|
|
|
{ "ikev2", no_argument, NULL, CD_IKEv2 +OO },
|
|
|
|
|
{ "ikev2-allow", no_argument, NULL, CD_IKEv2 +OO }, /* obsolete name */
|
|
|
|
|
- { "ikev2-propose", no_argument, NULL, CD_IKEv2 +OO }, /* obsolete, map onto allow */
|
|
|
|
|
+ /* not in RHEL8 { "ikev2-propose", no_argument, NULL, CD_IKEv2 +OO }, */
|
2019-11-05 18:48:41 +00:00
|
|
|
|
|
|
|
|
PS("allow-narrowing", IKEV2_ALLOW_NARROWING),
|
2021-05-18 06:45:49 +00:00
|
|
|
#ifdef AUTH_HAVE_PAM
|
|
|
|
|
@@ -1762,7 +1762,7 @@
|
|
|
|
|
end_seen = LEMPTY;
|
|
|
|
|
continue;
|
2019-11-05 18:48:41 +00:00
|
|
|
|
2021-05-18 06:45:49 +00:00
|
|
|
- /* --ikev1 --ikev2 --ikev2-propose */
|
|
|
|
|
+ /* --ikev1 --ikev2 */
|
|
|
|
|
case CD_IKEv1:
|
|
|
|
|
case CD_IKEv2:
|
|
|
|
|
{
|
