diff options
| -rw-r--r-- | config/client.conf | 6 | ||||
| -rw-r--r-- | readme.md | 8 | ||||
| -rw-r--r-- | tests/aes128_user/client.conf | 6 | ||||
| -rw-r--r-- | tests/aes256_anon/client.conf | 6 | ||||
| -rw-r--r-- | tests/basic256sha256_anon/client.conf | 6 | ||||
| -rw-r--r-- | tests/none_user/client.conf | 6 | ||||
| -rw-r--r-- | tests/nosec_anon/client.conf | 6 | ||||
| -rwxr-xr-x | tools/generate_certificate.sh | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/config/client.conf b/config/client.conf index dac9cb9..348bd6b 100644 --- a/config/client.conf +++ b/config/client.conf @@ -12,10 +12,10 @@ # username Username (required when authMode = user) # password Password (required when authMode = user) -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = SignAndEncrypt @@ -38,7 +38,7 @@ For encrypted operation, four identities are needed. Each call to tools/generate_certificate.sh certs ServerLDS tools/generate_certificate.sh certs ServerRegister tools/generate_certificate.sh certs ServerRegisterClient -tools/generate_certificate.sh certs ClientFindServers +tools/generate_certificate.sh certs Client ``` | Identity | Used by | Purpose | @@ -46,7 +46,7 @@ tools/generate_certificate.sh certs ClientFindServers | `ServerLDS` | ServerLDS | Server certificate for the LDS | | `ServerRegister` | ServerRegister | Server certificate for the registering server | | `ServerRegisterClient` | ServerRegister | Client certificate used when connecting to the LDS | -| `ClientFindServers` | Client | Client certificate for all client operations | +| `Client` | Client | Client certificate for all client operations | ### Populate the trust stores @@ -57,10 +57,10 @@ certificate: ```sh mkdir -p certs/trust/{server_lds,server_register,server_register_client,client} -ln -s ../../ServerRegisterClient_cert.der ../../ClientFindServers_cert.der \ +ln -s ../../ServerRegisterClient_cert.der ../../Client_cert.der \ certs/trust/server_lds/ -ln -s ../../ServerLDS_cert.der ../../ClientFindServers_cert.der \ +ln -s ../../ServerLDS_cert.der ../../Client_cert.der \ certs/trust/server_register/ ln -s ../../ServerLDS_cert.der \ diff --git a/tests/aes128_user/client.conf b/tests/aes128_user/client.conf index 614baff..77b43d2 100644 --- a/tests/aes128_user/client.conf +++ b/tests/aes128_user/client.conf @@ -1,9 +1,9 @@ # Client — test: aes128_user -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = SignAndEncrypt diff --git a/tests/aes256_anon/client.conf b/tests/aes256_anon/client.conf index d8d5ab2..5141e2c 100644 --- a/tests/aes256_anon/client.conf +++ b/tests/aes256_anon/client.conf @@ -1,9 +1,9 @@ # Client — test: aes256_anon -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = SignAndEncrypt diff --git a/tests/basic256sha256_anon/client.conf b/tests/basic256sha256_anon/client.conf index 5517368..26cd1cc 100644 --- a/tests/basic256sha256_anon/client.conf +++ b/tests/basic256sha256_anon/client.conf @@ -1,9 +1,9 @@ # Client — test: basic256sha256_anon -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = SignAndEncrypt diff --git a/tests/none_user/client.conf b/tests/none_user/client.conf index cb5d187..eba232e 100644 --- a/tests/none_user/client.conf +++ b/tests/none_user/client.conf @@ -1,9 +1,9 @@ # Client — test: none_user -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = None diff --git a/tests/nosec_anon/client.conf b/tests/nosec_anon/client.conf index 2e7f959..2c74f5e 100644 --- a/tests/nosec_anon/client.conf +++ b/tests/nosec_anon/client.conf @@ -1,9 +1,9 @@ # Client — test: nosec_anon -applicationUri = urn:localhost:bobink:ClientFindServers +applicationUri = urn:localhost:bobink:Client -certificate = certs/ClientFindServers_cert.der -privateKey = certs/ClientFindServers_key.der +certificate = certs/Client_cert.der +privateKey = certs/Client_key.der trustStore = certs/trust/client securityMode = None diff --git a/tools/generate_certificate.sh b/tools/generate_certificate.sh index 76f8a19..64ef981 100755 --- a/tools/generate_certificate.sh +++ b/tools/generate_certificate.sh @@ -5,7 +5,7 @@ # # Arguments: # $1 certs_dir — output directory for generated files (created if missing) -# $2 name — identity name (e.g. "ServerLDS", "ClientFindServers") +# $2 name — identity name (e.g. "ServerLDS", "Client") # $3 uri — (optional) application URI; defaults to urn:localhost:bobink:<name> # # Produces: |