Merge pull request #324 from n-kawauchi/ssl_certificate

SSL証明書ファイル名変更への対応

Author: n-ando

OpenRTM_aist/ext/http/rtc.https.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: ./
 manager.preload.modules: HTTPTransport.py
 
-corba.http.certificate_authority_file:../ssl/test/root.crt
-corba.http.key_file:../ssl/test/server.pem
+corba.http.certificate_authority_file:../ssl/test/root-sample.crt
+corba.http.key_file:../ssl/test/server-sample.pem
 corba.http.key_file_password:password
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call

OpenRTM_aist/ext/http/rtc.wss.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: ./
 manager.preload.modules: HTTPTransport.py
 
-corba.http.certificate_authority_file:../ssl/test/root.crt
-corba.http.key_file:../ssl/test/server.pem
+corba.http.certificate_authority_file:../ssl/test/root-sample.crt
+corba.http.key_file:../ssl/test/server-sample.pem
 corba.http.key_file_password:password
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws

OpenRTM_aist/ext/ssl/rtc.ssl.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: ./
 manager.preload.modules: SSLTransport.py
 
-corba.ssl.certificate_authority_file:test/root.crt
-corba.ssl.key_file:test/server.pem
+corba.ssl.certificate_authority_file:test/root-sample.crt
+corba.ssl.key_file:test/server-sample.pem
 corba.ssl.key_file_password:password
 corba.args:-ORBserverTransportRule "* ssl" -ORBclientTransportRule "* ssl" -ORBendPoint giop:ssl::
 corba.nameservers: corbaloc:ssliop:127.0.0.1:2809

OpenRTM_aist/ext/ssl/test/test_SSLTransport.py

@@ -65,8 +65,8 @@ def setUp(self):
         sys.argv.extend(['-o', 'manager.preload.modules:SSLTransport.py'])
         sys.argv.extend(['-o', 'manager.modules.load_path:./,../'])
         sys.argv.extend(
-            ['-o', 'corba.ssl.certificate_authority_file:root.crt'])
-        sys.argv.extend(['-o', 'corba.ssl.key_file:server.pem'])
+            ['-o', 'corba.ssl.certificate_authority_file:root-sample.crt'])
+        sys.argv.extend(['-o', 'corba.ssl.key_file:server-sample.pem'])
         sys.argv.extend(['-o', 'corba.ssl.key_file_password:password'])
         os.environ['ORBsslVerifyMode'] = "none"
         self.outport_process = multiprocessing.Process(

packages/deb/conf/http/rtc.https.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: /usr/lib/python3/dist-packages/OpenRTM_aist/ext/http 
 manager.preload.modules: HTTPTransport.py
 
-corba.http.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root.crt
-corba.http.key_file:/usr/share/openrtm-2.1/ssl/server.pem
+corba.http.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root-sample.crt
+corba.http.key_file:/usr/share/openrtm-2.1/ssl/server-sample.pem
 corba.http.key_file_password:password
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call

packages/deb/conf/http/rtc.wss.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: /usr/lib/python3/dist-packages/OpenRTM_aist/ext/http 
 manager.preload.modules: HTTPTransport.py
 
-corba.http.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root.crt
-corba.http.key_file:/usr/share/openrtm-2.1/ssl/server.pem
+corba.http.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root-sample.crt
+corba.http.key_file:/usr/share/openrtm-2.1/ssl/server-sample.pem
 corba.http.key_file_password:password
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws

packages/deb/conf/ssl/rtc.ssl.conf

@@ -5,8 +5,8 @@ logger.log_level: DEBUG
 manager.modules.load_path: /usr/lib/python3/dist-packages/OpenRTM_aist/ext/ssl 
 manager.preload.modules: SSLTransport.py
 
-corba.ssl.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root.crt
-corba.ssl.key_file:/usr/share/openrtm-2.1/ssl/server.pem
+corba.ssl.certificate_authority_file:/usr/share/openrtm-2.1/ssl/root-sample.crt
+corba.ssl.key_file:/usr/share/openrtm-2.1/ssl/server-sample.pem
 corba.ssl.key_file_password:password
 corba.args:-ORBserverTransportRule "* ssl" -ORBclientTransportRule "* ssl" -ORBendPoint giop:ssl::
 corba.nameservers: corbaloc:ssliop:127.0.0.1:2809