5 files changed, 27 insertions, 36 deletions
diff --git a/tests/basic256sha256_anon/client.conf b/tests/basic256sha256_anon/client.conf
new file mode 100644
index 0000000..e46bb4c
--- /dev/null
+++ b/tests/basic256sha256_anon/client.conf
@@ -0,0 +1,9 @@
+# Client — test: basic256sha256_anon
+
+applicationUri = urn:bobink.ClientFindServers
+certificate = certs/ClientFindServers_cert.der
+privateKey = certs/ClientFindServers_key.der
+securityMode = SignAndEncrypt
+securityPolicy = Basic256Sha256
+authMode = anonymous
+trustStore = certs/trust/client
diff --git a/tests/basic256sha256_anon/client_find_servers.conf b/tests/basic256sha256_anon/client_find_servers.conf
deleted file mode 100644
index 332c3da..0000000
--- a/tests/basic256sha256_anon/client_find_servers.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# ClientFindServers — test: basic256sha256_anon
-
-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 = Basic256Sha256
-discoveryAuthMode = anonymous
-discoveryTrustList = certs/ServerLDS_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_anon/server_lds.conf b/tests/basic256sha256_anon/server_lds.conf
index 7da2fd6..add5f46 100644
--- a/tests/basic256sha256_anon/server_lds.conf
+++ b/tests/basic256sha256_anon/server_lds.conf
@@ -8,5 +8,4 @@ cleanupTimeout = 60
 
 authMode = anonymous
 
-trustList = certs/ServerRegisterClient_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_lds
diff --git a/tests/basic256sha256_anon/server_register.conf b/tests/basic256sha256_anon/server_register.conf
index 798bf31..a5f904c 100644
--- a/tests/basic256sha256_anon/server_register.conf
+++ b/tests/basic256sha256_anon/server_register.conf
@@ -1,21 +1,12 @@
-# ServerRegister — test: basic256sha256_anon
+# ServerRegister server config — test: basic256sha256_anon
 
 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 = Basic256Sha256
+authMode = anonymous
 
-serverAuthMode = anonymous
-
-clientAuthMode = anonymous
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_register
diff --git a/tests/basic256sha256_anon/server_register_client.conf b/tests/basic256sha256_anon/server_register_client.conf
new file mode 100644
index 0000000..3a80d21
--- /dev/null
+++ b/tests/basic256sha256_anon/server_register_client.conf
@@ -0,0 +1,12 @@
+# ServerRegister client config — test: basic256sha256_anon
+
+applicationUri = urn:bobink.ServerRegister
+certificate = certs/ServerRegisterClient_cert.der
+privateKey = certs/ServerRegisterClient_key.der
+
+securityMode = SignAndEncrypt
+securityPolicy = Basic256Sha256
+
+authMode = anonymous
+
+trustStore = certs/trust/server_register_client