New upstream version 5.5.2

2 files changed, 4 insertions, 4 deletions

diff --git a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
index 71ae251a6..e7b5caaf8 100755
--- a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
@@ -5,7 +5,7 @@ swanctl {
 }
 
 charon {
-  load = random nonce sha1 sha2 aes des hmac pkcs1 pem pubkey x509 revocation constraints gmp curl kernel-netlink socket-default updown vici 
+  load = random nonce aes des sha1 sha2 hmac pkcs1 pem x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
 
   start-scripts {
     creds = /usr/local/sbin/swanctl --load-creds 
diff --git a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf
index 8356c0249..76a6c8970 100755
--- a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf
+++ b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf
@@ -15,11 +15,11 @@ connections {
             local_ts  = 10.1.0.0/28
 
             updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128-sha256-modp3072 
+            esp_proposals = aes128-sha256-x25519
          }
       }
       version = 1 
-      proposals = aes128-sha256-modp3072,3des-sha1-modp2048
+      proposals = aes128-sha256-x25519,3des-sha1-modp2048
    }
 
    rw-2 {
@@ -40,6 +40,6 @@ connections {
          }
       }
       version = 1
-      proposals = 3des-sha1-modp2048,aes128-sha256-modp3072
+      proposals = 3des-sha1-modp2048,aes128-sha256-x25519
    }
 }