Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OpenRTM_aist/ext/http/rtc.https.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions OpenRTM_aist/ext/http/rtc.wss.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions OpenRTM_aist/ext/ssl/rtc.ssl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions OpenRTM_aist/ext/ssl/test/test_SSLTransport.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions packages/deb/conf/http/rtc.https.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/deb/conf/http/rtc.wss.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/deb/conf/ssl/rtc.ssl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading