6 files changed, 96 insertions, 54 deletions
diff --git a/tests/aes128_anon/client_find_servers.conf b/tests/aes128_anon/client_find_servers.conf
index 87eed56..2cc096d 100644
--- a/tests/aes128_anon/client_find_servers.conf
+++ b/tests/aes128_anon/client_find_servers.conf
@@ -2,13 +2,19 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = SignAndEncrypt
-securityPolicy = Aes128_Sha256_RsaOaep
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = SignAndEncrypt
+discoverySecurityPolicy = Aes128_Sha256_RsaOaep
+discoveryAuthMode = anonymous
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = anonymous
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = SignAndEncrypt
+serverSecurityPolicy = Aes128_Sha256_RsaOaep
+serverAuthMode = anonymous
+serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/aes128_user/client_find_servers.conf b/tests/aes128_user/client_find_servers.conf
index 58d7bd1..4ecff56 100644
--- a/tests/aes128_user/client_find_servers.conf
+++ b/tests/aes128_user/client_find_servers.conf
@@ -2,15 +2,23 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = SignAndEncrypt
-securityPolicy = Aes128_Sha256_RsaOaep
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = SignAndEncrypt
+discoverySecurityPolicy = Aes128_Sha256_RsaOaep
+discoveryAuthMode = user
+discoveryUsername = user
+discoveryPassword = password
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = user
-username = user
-password = password
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = SignAndEncrypt
+serverSecurityPolicy = Aes128_Sha256_RsaOaep
+serverAuthMode = user
+serverUsername = user
+serverPassword = password
+serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/basic256sha256_anon/client_find_servers.conf b/tests/basic256sha256_anon/client_find_servers.conf
index fb3d9d4..332c3da 100644
--- a/tests/basic256sha256_anon/client_find_servers.conf
+++ b/tests/basic256sha256_anon/client_find_servers.conf
@@ -2,13 +2,19 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = SignAndEncrypt
-securityPolicy = Basic256Sha256
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = SignAndEncrypt
+discoverySecurityPolicy = Basic256Sha256
+discoveryAuthMode = anonymous
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = anonymous
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = SignAndEncrypt
+serverSecurityPolicy = Basic256Sha256
+serverAuthMode = anonymous
+serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/basic256sha256_user/client_find_servers.conf b/tests/basic256sha256_user/client_find_servers.conf
index 93f511c..403dfa4 100644
--- a/tests/basic256sha256_user/client_find_servers.conf
+++ b/tests/basic256sha256_user/client_find_servers.conf
@@ -2,15 +2,23 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = SignAndEncrypt
-securityPolicy = Basic256Sha256
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = SignAndEncrypt
+discoverySecurityPolicy = Basic256Sha256
+discoveryAuthMode = user
+discoveryUsername = user
+discoveryPassword = password
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = user
-username = user
-password = password
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = SignAndEncrypt
+serverSecurityPolicy = Basic256Sha256
+serverAuthMode = user
+serverUsername = user
+serverPassword = password
+serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/none_anon/client_find_servers.conf b/tests/none_anon/client_find_servers.conf
index 8d874e7..6ea7d2d 100644
--- a/tests/none_anon/client_find_servers.conf
+++ b/tests/none_anon/client_find_servers.conf
@@ -2,13 +2,19 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = None
-securityPolicy = None
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = None
+discoverySecurityPolicy = None
+discoveryAuthMode = anonymous
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = anonymous
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = None
+serverSecurityPolicy = None
+serverAuthMode = anonymous
+serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/none_user/client_find_servers.conf b/tests/none_user/client_find_servers.conf
index 10e9888..b538952 100644
--- a/tests/none_user/client_find_servers.conf
+++ b/tests/none_user/client_find_servers.conf
@@ -2,15 +2,23 @@
 
 discoveryEndpoint = opc.tcp://localhost:14840
 applicationUri = urn:bobink.ClientFindServers
-certificate = certs/ClientFindServers_cert.der
-privateKey = certs/ClientFindServers_key.der
 
-securityMode = None
-securityPolicy = None
+# Discovery (LDS) side
+discoveryCertificate = certs/ClientFindServers_cert.der
+discoveryPrivateKey = certs/ClientFindServers_key.der
+discoverySecurityMode = None
+discoverySecurityPolicy = None
+discoveryAuthMode = user
+discoveryUsername = user
+discoveryPassword = password
+discoveryTrustList = certs/ServerLDS_cert.der
 
-authMode = user
-username = user
-password = password
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ServerRegister_cert.der
+# Server side
+serverCertificate = certs/ClientFindServers_cert.der
+serverPrivateKey = certs/ClientFindServers_key.der
+serverSecurityMode = None
+serverSecurityPolicy = None
+serverAuthMode = user
+serverUsername = user
+serverPassword = password
+serverTrustList = certs/ServerRegister_cert.der