summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 12:10:18 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 12:10:18 +0100
commit2578fef175f99ce2e03a764514c428e0ca7f7de5 (patch)
tree0f6f1f2cc46a3695bbf05cbf51f15a260fa0dcde
parentc6e382658aa985f4d2cbb8fb01037c954a31d5bf (diff)
downloadATCD-2578fef175f99ce2e03a764514c428e0ca7f7de5.tar.gz
Use different certificates
* TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml: * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf: * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml: * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf:
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf3
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml2
4 files changed, 4 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
index f1ebc8c1b57..dea4604403a 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
@@ -1,6 +1,5 @@
-
dynamic SSLIOP_Factory Service_Object *
TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
- "-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"
+ "-SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
index 388ce2b122c..11f3ac0aa91 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<dynamic id="SSLIOP_Factory" type="Service_Object">
- <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"/>
+ <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"/>
</dynamic>
<static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
index ccf92593f69..2310cda1145 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
@@ -1,6 +1,6 @@
dynamic SSLIOP_Factory Service_Object *
TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
- "-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
+ "-SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
index 42d208bc1e8..4a0945ff435 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<dynamic id="SSLIOP_Factory" type="Service_Object">
- <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
+ <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"/>
</dynamic>
<static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
</ACE_Svc_Conf>