5 files changed, 33 insertions, 44 deletions
diff --git a/tests/aes128_user/client.conf b/tests/aes128_user/client.conf
new file mode 100644
index 0000000..026cd99
--- /dev/null
+++ b/tests/aes128_user/client.conf
@@ -0,0 +1,11 @@
+# Client — test: aes128_user
+
+applicationUri = urn:bobink.ClientFindServers
+certificate = certs/ClientFindServers_cert.der
+privateKey = certs/ClientFindServers_key.der
+securityMode = SignAndEncrypt
+securityPolicy = Aes128_Sha256_RsaOaep
+authMode = user
+username = user
+password = password
+trustStore = certs/trust/client
diff --git a/tests/aes128_user/client_find_servers.conf b/tests/aes128_user/client_find_servers.conf
deleted file mode 100644
index 4ecff56..0000000
--- a/tests/aes128_user/client_find_servers.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ClientFindServers — test: aes128_user
-
-discoveryEndpoint = opc.tcp://localhost:14840
-applicationUri = urn:bobink.ClientFindServers
-
-# 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
-
-# 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/aes128_user/server_lds.conf b/tests/aes128_user/server_lds.conf
index 484512a..c440ea4 100644
--- a/tests/aes128_user/server_lds.conf
+++ b/tests/aes128_user/server_lds.conf
@@ -10,5 +10,4 @@ authMode = user
 username = user
 password = password
 
-trustList = certs/ServerRegisterClient_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_lds
diff --git a/tests/aes128_user/server_register.conf b/tests/aes128_user/server_register.conf
index e100129..b0ce271 100644
--- a/tests/aes128_user/server_register.conf
+++ b/tests/aes128_user/server_register.conf
@@ -1,25 +1,14 @@
-# ServerRegister — test: aes128_user
+# ServerRegister server config — test: aes128_user
 
 port = 14841
 applicationUri = urn:bobink.ServerRegister
-serverCertificate = certs/ServerRegister_cert.der
-serverPrivateKey = certs/ServerRegister_key.der
-clientCertificate = certs/ServerRegisterClient_cert.der
-clientPrivateKey = certs/ServerRegisterClient_key.der
+certificate = certs/ServerRegister_cert.der
+privateKey = certs/ServerRegister_key.der
 
-discoveryEndpoint = opc.tcp://localhost:14840
 registerInterval = 10
 
-securityMode = SignAndEncrypt
-securityPolicy = Aes128_Sha256_RsaOaep
+authMode = user
+username = user
+password = password
 
-serverAuthMode = user
-serverUsername = user
-serverPassword = password
-
-clientAuthMode = user
-clientUsername = user
-clientPassword = password
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_register
diff --git a/tests/aes128_user/server_register_client.conf b/tests/aes128_user/server_register_client.conf
new file mode 100644
index 0000000..c919f7e
--- /dev/null
+++ b/tests/aes128_user/server_register_client.conf
@@ -0,0 +1,14 @@
+# ServerRegister client config — test: aes128_user
+
+applicationUri = urn:bobink.ServerRegister
+certificate = certs/ServerRegisterClient_cert.der
+privateKey = certs/ServerRegisterClient_key.der
+
+securityMode = SignAndEncrypt
+securityPolicy = Aes128_Sha256_RsaOaep
+
+authMode = user
+username = user
+password = password
+
+trustStore = certs/trust/server_register_client