From 6f948c5c8d15be0bc0d3dc568037ff3da4a9408a Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 30 May 2012 07:21:03 +0200
Subject: [PATCH] added nonce plugin to gcrypt scenarios

---
 .../alg-serpent/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf | 2 +-
 .../alg-twofish/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf | 2 +-
 .../alg-serpent/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf | 2 +-
 .../alg-twofish/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf | 2 +-
 .../alg-serpent/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf | 2 +-
 .../alg-twofish/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf | 2 +-
 .../gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf    | 2 +-
 .../gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf     | 2 +-
 .../gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf    | 2 +-
 .../gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf     | 2 +-
 .../gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf   | 2 +-
 .../gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf    | 2 +-
 .../tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf  | 2 +-
 .../tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf
index 5e09a3a1db..4b3de4d9c1 100644
--- a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+  load = pem pkcs1 x509 gcrypt nonce hmac curl kernel-netlink
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
index 33591562a7..969a5f5aa5 100644
--- a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
   send_vendor_id = yes
 }
 
diff --git a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
index dafa85bd14..3c094be348 100644
--- a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
 }
diff --git a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
index dafa85bd14..3c094be348 100644
--- a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  load = curl pem pkcs1 gcrypt nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
 }
diff --git a/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
index 92fcbd6419..671d973426 100644
--- a/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors pem pkcs1 gcrypt x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
+  load = curl test-vectors pem pkcs1 gcrypt nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
 }
 
 libstrongswan {
diff --git a/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
index 92fcbd6419..671d973426 100644
--- a/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl test-vectors pem pkcs1 gcrypt x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
+  load = curl test-vectors pem pkcs1 gcrypt nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
 }
 
 libstrongswan {
-- 
2.47.2