From 32f578ee90a1a8a67aea1eefd007958ca9424d6e Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Fri, 21 Jan 2022 19:39:18 +0900 Subject: [PATCH 1/5] [compat] support ssl and http transport. --- OpenRTM_aist/CORBA_RTCUtil.py | 183 +++++++++++++++++++++++++++ OpenRTM_aist/Manager.py | 23 ++-- OpenRTM_aist/NamingManager.py | 127 ++++++++++--------- OpenRTM_aist/ext/http/rtc.http.conf | 4 +- OpenRTM_aist/ext/http/rtc.https.conf | 4 +- OpenRTM_aist/ext/http/rtc.ws.conf | 4 +- OpenRTM_aist/ext/http/rtc.wss.conf | 4 +- OpenRTM_aist/ext/ssl/rtc.ssl.conf | 4 +- 8 files changed, 276 insertions(+), 77 deletions(-) diff --git a/OpenRTM_aist/CORBA_RTCUtil.py b/OpenRTM_aist/CORBA_RTCUtil.py index 177d956f..f2045756 100644 --- a/OpenRTM_aist/CORBA_RTCUtil.py +++ b/OpenRTM_aist/CORBA_RTCUtil.py @@ -1757,3 +1757,186 @@ def getPort(self): # @endif def isAddressOnly(self): return self._addressonly + + +## +# @if jp +# @class RTCURIObject クラス +# @brief RTCURIObject クラス +# rtcname形式、rtcloc形式のURIから通信先のアドレス、RTC名等を +# 取得する機能を提供するクラス +# rtcname形式は以下のようにrtcname.{通信プロトコル}/{アドレス}/{ネームサーバーでの登録パス} +# で指定可能である。通信プロトコルを省略するとiiopに設定する。 +# +# rtcname.ssliop://localhost:2809/test.host_cxt/ConsoleOut0 +# +# ただし、http通信を指定する場合は以下のようにアドレスの後は#で区切る必要がある。 +# +# rtcname.https://localhost:2809/call#test.host_cxt/ConsoleOut0 +# +# rtcloc形式は以下のようにrtcloc.{通信プロトコル}/{アドレス}/{カテゴリ名}/{RTC名} +# で指定可能である。通信プロトコルを省略するとiiopに設定する。 +# +# rtcloc.ssliop://localhost:2810/example/ConsoleOut0 +# +# ただし、http通信を指定する場合は以下のようにアドレスの後は#で区切る必要がある。 +# +# rtcloc.http://localhost:2810/call#example/ConsoleOut0 +# +# @since 2.0.0 +# +# @else +# @class RTCURIObject class +# @brief RTCURIObject class +# @brief +# +# @since 2.0.0 +# +# @endif +class RTCURIObject: + ## + # @if jp + # + # @brief コンストラクタ + # + # @param uri rtcname形式、もしくはrtcloc形式のURI + # @param isrtcname rtcname形式を指定する場合はtrue、それ以外はfalse + # @param isrtcloc rtcloc形式を指定する場合はtrue、それ以外はfalse + # + # @else + # + # @brief Consructor + # + # + # @param uri + # @param isrtcname + # @param isrtcloc + # + # @endif + def __init__(self, uri, isrtcname=False, isrtcloc=False): + self._is_rtcname = False + self._is_rtcloc = False + self._rtcpath = "" + self._address = "" + pos = uri.find("://") + if pos >= 0: + ptype = uri[0:pos] + addrname = uri[pos+3:] + protocol = "" + + if ptype.find("rtcname") == 0: + self._is_rtcname = True + elif ptype.find("rtcloc") == 0: + self._is_rtcloc = True + else: + return + + if isrtcname: + if not self._is_rtcname: + return + + if isrtcloc: + if not self._is_rtcloc: + return + + pos = ptype.find(".") + seprtc = "/" + if pos >= 0: + protocol = ptype[pos+1:] + if protocol == "http" or protocol == "https" or protocol == "ws" or protocol == "wss": + seprtc = "#" + + pos = addrname.find(seprtc) + hostport = "" + + if pos >= 0: + hostport = addrname[0:pos] + self._rtcpath = addrname[pos+1:] + else: + self._rtcpath = addrname + + if protocol == "http" or protocol == "https" or protocol == "ws" or protocol == "wss": + self._address = protocol + self._address += "://" + self._address += hostport + + else: + self._address = "corbaloc:" + self._address += protocol + self._address += ":" + self._address += hostport + + ## + # @if jp + # + # @brief デストラクタ + # + # + # @else + # + # @brief Destructor + # + # + # @endif + def getRTCName(self): + return self._rtcpath + + ## + # @if jp + # + # @brief RTC名を取得する + # + # rtcname形式の場合はネームサーバーに登録したRTCのパスを取得できる。 + # context1.kind1/context2.kind2/..../RTC_name + # + # rtcloc形式の場合はカテゴリ名/RTC名で取得できる。 + # + # @return RTC名 + # + # @else + # + # @brief + # + # @return + # + # @endif + def getAddress(self): + return self._address + + ## + # @if jp + # + # @brief URIがrtcname形式かを判定する + # + # @return true：rtcname形式、false：それ以外 + # + # @return RTC名 + # + # @else + # + # @brief + # + # @return + # + # @endif + def isRTCNameURI(self): + return self._is_rtcname + + ## + # @if jp + # + # @brief URIがrtcname形式かを判定する + # + # @brief URIがrtcloc形式かを判定する + # + # @return true：rtcname形式、false：それ以外 + # + # @else + # + # @brief + # + # @return + # + # @endif + def isRTCLocURI(self): + return self._is_rtcloc diff --git a/OpenRTM_aist/Manager.py b/OpenRTM_aist/Manager.py index eef7e7d4..b2966960 100644 --- a/OpenRTM_aist/Manager.py +++ b/OpenRTM_aist/Manager.py @@ -3209,9 +3209,12 @@ def initPreConnection(self): if not ("interface_type" in configs.keys()): configs["interface_type"] = "corba_cdr" - tmp = port0_str.split(".") - tmp.pop() - comp0_name = OpenRTM_aist.flatten(tmp, ".") + pos_port0 = port0_str.rfind(".") + comp0_name = "" + if pos_port0 >= 0: + comp0_name = port0_str[0:pos_port0] + else: + comp0_name = port0_str port0_name = port0_str @@ -3234,7 +3237,7 @@ def initPreConnection(self): comp0_ref, port0_name) if CORBA.is_nil(port0_var): - self._rtcout.RTC_DEBUG("port %s found: " % port0_str) + self._rtcout.RTC_DEBUG("port %s not found: " % port0_str) continue if not ports: @@ -3251,9 +3254,13 @@ def initPreConnection(self): for port_str in ports: - tmp = port_str.split(".") - tmp.pop() - comp_name = OpenRTM_aist.flatten(tmp, ".") + pos_port = port_str.rfind(".") + comp_name = "" + if pos_port >= 0: + comp_name = port_str[0:pos_port] + else: + comp_name = port_str + port_name = port_str if comp_name.find("://") == -1: @@ -3275,7 +3282,7 @@ def initPreConnection(self): comp_ref, port_name) if CORBA.is_nil(port_var): - self._rtcout.RTC_DEBUG("port %s found: " % port_str) + self._rtcout.RTC_DEBUG("port %s not found: " % port_str) continue prop = OpenRTM_aist.Properties() diff --git a/OpenRTM_aist/NamingManager.py b/OpenRTM_aist/NamingManager.py index 0d695e78..f4c7809a 100644 --- a/OpenRTM_aist/NamingManager.py +++ b/OpenRTM_aist/NamingManager.py @@ -280,6 +280,7 @@ def getCorbaNaming(self): # @endif def getComponentByName(self, context, name, rtcs): + self._rtcout.RTC_TRACE("getComponentByName(name = %s)", name) length = 500 bl, bi = context.list(length) for i in bl: @@ -318,43 +319,51 @@ def getComponentByName(self, context, name, rtcs): # virtual RTCList string_to_component(string name) = 0; def string_to_component(self, name): + self._rtcout.RTC_TRACE("string_to_component(name = %s)", name) rtc_list = [] - tmp = name.split("://") - if len(tmp) > 1: - if tmp[0] == "rtcname": - #tag = tmp[0] - url = tmp[1] - r = url.split("/") - if len(r) > 1: - host = r[0] - rtc_name = url[len(host) + 1:] + rtcuri = OpenRTM_aist.CORBA_RTCUtil.RTCURIObject(name, True, False) - try: - cns = None - if host == "*": - cns = self._cosnaming - else: - orb = OpenRTM_aist.Manager.instance().getORB() - cns = OpenRTM_aist.CorbaNaming(orb, host) - names = rtc_name.split("/") - - if len(names) == 2 and names[0] == "*": - root_cxt = cns.getRootContext() - self.getComponentByName( - root_cxt, names[1], rtc_list) - return rtc_list - else: - rtc_name += ".rtc" - obj = cns.resolveStr(rtc_name) - if CORBA.is_nil(obj): - return [] - if obj._non_existent(): - return [] - rtc_list.append(obj) - return rtc_list - except BaseException: - return [] + if not rtcuri.isRTCNameURI(): + self._rtcout.RTC_WARN("syntax error: %s", name) + return rtc_list + else: + self._rtcout.RTC_INFO("URI: %s, Address: %s, Name: %s", + (name, rtcuri.getAddress(), + rtcuri.getRTCName())) + try: + cns = None + if rtcuri.getAddress() == "*": + cns = self._cosnaming + else: + orb = OpenRTM_aist.Manager.instance().getORB() + cns = OpenRTM_aist.CorbaNaming(orb, rtcuri.getAddress()) + + rtcname = rtcuri.getRTCName() + context = "" + compname = "" + + pos = rtcname.find("/") + if pos >= 0: + context = rtcname[0:pos] + compname = rtcname[pos + 1:] + + if context == "*": + root_cxt = cns.getRootContext() + self.getComponentByName( + root_cxt, compname, rtc_list) + return rtc_list + else: + rtcname += ".rtc" + obj = cns.resolveStr(rtcname) + if CORBA.is_nil(obj): + return rtc_list + if obj._non_existent(): + return rtc_list + rtc_list.append(obj) + return rtc_list + except BaseException: + return rtc_list return rtc_list @@ -501,33 +510,32 @@ def isAlive(self): # # virtual RTCList string_to_component(); def string_to_component(self, name): + self._rtcout.RTC_TRACE("string_to_component(name = %s)", name) rtc_list = [] - tmp = name.split("://") - - if len(tmp) > 1: - if tmp[0] == "rtcloc": - #tag = tmp[0] - url = tmp[1] - r = url.split("/") - if len(r) > 1: - host = r[0] - rtc_name = url[len(host) + 1:] - - mgr = self.getManager(host) - if not CORBA.is_nil(mgr): - rtc_list = mgr.get_components_by_name(rtc_name) - - slaves = mgr.get_slave_managers() - for slave in slaves: - try: - rtc_list.extend( - slave.get_components_by_name(rtc_name)) - except BaseException: - self._rtcout.RTC_DEBUG( - OpenRTM_aist.Logger.print_exception()) - mgr.remove_slave_manager(slave) - return rtc_list + rtcuri = OpenRTM_aist.CORBA_RTCUtil.RTCURIObject(name, False, True) + + if not rtcuri.isRTCLocURI(): + self._rtcout.RTC_WARN("syntax error: %s", name) + return rtc_list + else: + self._rtcout.RTC_INFO("URI: %s, Address: %s, Name: %s", + (name, rtcuri.getAddress(), + rtcuri.getRTCName())) + + mgr = self.getManager(rtcuri.getAddress()) + if not CORBA.is_nil(mgr): + rtc_list = mgr.get_components_by_name(rtcuri.getRTCName()) + slaves = mgr.get_slave_managers() + for slave in slaves: + try: + rtc_list.extend( + slave.get_components_by_name(rtcuri.getRTCName())) + except BaseException: + self._rtcout.RTC_DEBUG( + OpenRTM_aist.Logger.print_exception()) + mgr.remove_slave_manager(slave) + return rtc_list return rtc_list ## @@ -549,6 +557,7 @@ def string_to_component(self, name): # # virtual Manager_ptr getManager(string name); def getManager(self, name): + self._rtcout.RTC_TRACE("getManager(name = %s)", name) if name == "*": mgr_sev = self._mgr.getManagerServant() mgr = None diff --git a/OpenRTM_aist/ext/http/rtc.http.conf b/OpenRTM_aist/ext/http/rtc.http.conf index 38f71370..63fdb0dc 100644 --- a/OpenRTM_aist/ext/http/rtc.http.conf +++ b/OpenRTM_aist/ext/http/rtc.http.conf @@ -6,5 +6,5 @@ manager.modules.load_path: ./ manager.preload.modules: HTTPTransport.py corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call -corba.nameservers: http://127.0.0.1:2809/call -corba.master_manager: giop:http:http://127.0.0.1:2810/call +corba.nameservers: http://localhost:2809/call +corba.master_manager: giop:http:http://localhost:2810/call diff --git a/OpenRTM_aist/ext/http/rtc.https.conf b/OpenRTM_aist/ext/http/rtc.https.conf index fe9f59f2..471cfa9b 100644 --- a/OpenRTM_aist/ext/http/rtc.https.conf +++ b/OpenRTM_aist/ext/http/rtc.https.conf @@ -10,5 +10,5 @@ corba.http.key_file:../ssl/test/server.pem corba.http.key_file_password:password corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call -corba.nameservers: https://127.0.0.1:2809/call -corba.master_manager: giop:http:https://127.0.0.1:2810/call +corba.nameservers: https://localhost:2809/call +corba.master_manager: giop:http:https://localhost:2810/call diff --git a/OpenRTM_aist/ext/http/rtc.ws.conf b/OpenRTM_aist/ext/http/rtc.ws.conf index 93aac207..6c191ed1 100644 --- a/OpenRTM_aist/ext/http/rtc.ws.conf +++ b/OpenRTM_aist/ext/http/rtc.ws.conf @@ -6,5 +6,5 @@ manager.modules.load_path: ./ manager.preload.modules: HTTPTransport.py corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws -corba.nameservers: ws://127.0.0.1:2809/ws -corba.master_manager: giop:http:ws://127.0.0.1:2810/ws +corba.nameservers: ws://localhost:2809/ws +corba.master_manager: giop:http:ws://localhost:2810/ws diff --git a/OpenRTM_aist/ext/http/rtc.wss.conf b/OpenRTM_aist/ext/http/rtc.wss.conf index af38d952..4059f311 100644 --- a/OpenRTM_aist/ext/http/rtc.wss.conf +++ b/OpenRTM_aist/ext/http/rtc.wss.conf @@ -10,5 +10,5 @@ corba.http.key_file:../ssl/test/server.pem corba.http.key_file_password:password corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws -corba.nameservers: wss://127.0.0.1:2809/ws -corba.master_manager: giop:http:wss://127.0.0.1:2810/ws +corba.nameservers: wss://localhost:2809/ws +corba.master_manager: giop:http:wss://localhost:2810/ws diff --git a/OpenRTM_aist/ext/ssl/rtc.ssl.conf b/OpenRTM_aist/ext/ssl/rtc.ssl.conf index b0ea8ac8..404ec6d1 100644 --- a/OpenRTM_aist/ext/ssl/rtc.ssl.conf +++ b/OpenRTM_aist/ext/ssl/rtc.ssl.conf @@ -9,5 +9,5 @@ corba.ssl.certificate_authority_file:test/root.crt corba.ssl.key_file:test/server.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 -corba.master_manager: giop:ssl:127.0.0.1:2810 +corba.nameservers: corbaloc:ssliop:localhost:2809 +corba.master_manager: giop:ssl:localhost:2810 From 18cf2b5a377c354b10f9aa47d72bb3b9d0189335 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Sun, 13 Feb 2022 11:13:51 +0900 Subject: [PATCH 2/5] [compat] fixed comment. --- OpenRTM_aist/CORBA_RTCUtil.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/OpenRTM_aist/CORBA_RTCUtil.py b/OpenRTM_aist/CORBA_RTCUtil.py index f2045756..9e62d1dc 100644 --- a/OpenRTM_aist/CORBA_RTCUtil.py +++ b/OpenRTM_aist/CORBA_RTCUtil.py @@ -1869,13 +1869,20 @@ def __init__(self, uri, isrtcname=False, isrtcloc=False): ## # @if jp # - # @brief デストラクタ + # @brief RTC名を取得する + # + # rtcname形式の場合はネームサーバーに登録したRTCのパスを取得できる。 + # context1.kind1/context2.kind2/..../RTC_name # + # rtcloc形式の場合はカテゴリ名/RTC名で取得できる。 + # + # @return RTC名 # # @else # - # @brief Destructor + # @brief # + # @return # # @endif def getRTCName(self): @@ -1884,14 +1891,10 @@ def getRTCName(self): ## # @if jp # - # @brief RTC名を取得する + # @brief 通信先のアドレスを取得する # - # rtcname形式の場合はネームサーバーに登録したRTCのパスを取得できる。 - # context1.kind1/context2.kind2/..../RTC_name # - # rtcloc形式の場合はカテゴリ名/RTC名で取得できる。 - # - # @return RTC名 + # @return 通信先のアドレス # # @else # From 5ff9cee9ea2699bbf8b661ee698c292245bb0a6a Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Fri, 18 Feb 2022 00:53:00 +0900 Subject: [PATCH 3/5] [compat] fixed bugs. --- OpenRTM_aist/CORBA_RTCUtil.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/OpenRTM_aist/CORBA_RTCUtil.py b/OpenRTM_aist/CORBA_RTCUtil.py index 9e62d1dc..03654344 100644 --- a/OpenRTM_aist/CORBA_RTCUtil.py +++ b/OpenRTM_aist/CORBA_RTCUtil.py @@ -1853,18 +1853,21 @@ def __init__(self, uri, isrtcname=False, isrtcloc=False): hostport = addrname[0:pos] self._rtcpath = addrname[pos+1:] else: - self._rtcpath = addrname - - if protocol == "http" or protocol == "https" or protocol == "ws" or protocol == "wss": - self._address = protocol - self._address += "://" - self._address += hostport + hostport = addrname + if hostport != "*": + if protocol == "http" or protocol == "https" or protocol == "ws" or protocol == "wss": + self._address = protocol + self._address += "://" + self._address += hostport + + else: + self._address = "corbaloc:" + self._address += protocol + self._address += ":" + self._address += hostport else: - self._address = "corbaloc:" - self._address += protocol - self._address += ":" - self._address += hostport + self._address = hostport ## # @if jp From c46f0531bf9673e380b9b07b7491b5e059e92022 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Tue, 14 Apr 2026 17:09:00 +0900 Subject: [PATCH 4/5] [compat]fixed confing files. --- OpenRTM_aist/ext/http/rtc.http.conf | 2 +- OpenRTM_aist/ext/http/rtc.https.conf | 2 +- OpenRTM_aist/ext/http/rtc.ws.conf | 2 +- OpenRTM_aist/ext/http/rtc.wss.conf | 2 +- OpenRTM_aist/ext/ssl/test/root-sample.crt | 22 ++++ OpenRTM_aist/ext/ssl/test/root.crt | 21 ---- OpenRTM_aist/ext/ssl/test/server-sample.pem | 109 ++++++++++++++++++++ OpenRTM_aist/ext/ssl/test/server.pem | 48 --------- 8 files changed, 135 insertions(+), 73 deletions(-) create mode 100644 OpenRTM_aist/ext/ssl/test/root-sample.crt delete mode 100644 OpenRTM_aist/ext/ssl/test/root.crt create mode 100644 OpenRTM_aist/ext/ssl/test/server-sample.pem delete mode 100644 OpenRTM_aist/ext/ssl/test/server.pem diff --git a/OpenRTM_aist/ext/http/rtc.http.conf b/OpenRTM_aist/ext/http/rtc.http.conf index 63fdb0dc..b0feeff6 100644 --- a/OpenRTM_aist/ext/http/rtc.http.conf +++ b/OpenRTM_aist/ext/http/rtc.http.conf @@ -5,6 +5,6 @@ logger.log_level: DEBUG manager.modules.load_path: ./ manager.preload.modules: HTTPTransport.py -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call -ORBendPoint giop:tcp:: corba.nameservers: http://localhost:2809/call corba.master_manager: giop:http:http://localhost:2810/call diff --git a/OpenRTM_aist/ext/http/rtc.https.conf b/OpenRTM_aist/ext/http/rtc.https.conf index f8da01dc..091c1cc8 100644 --- a/OpenRTM_aist/ext/http/rtc.https.conf +++ b/OpenRTM_aist/ext/http/rtc.https.conf @@ -9,6 +9,6 @@ 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 +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call -ORBendPoint giop:tcp:: corba.nameservers: https://localhost:2809/call corba.master_manager: giop:http:https://localhost:2810/call diff --git a/OpenRTM_aist/ext/http/rtc.ws.conf b/OpenRTM_aist/ext/http/rtc.ws.conf index 6c191ed1..b432bcdf 100644 --- a/OpenRTM_aist/ext/http/rtc.ws.conf +++ b/OpenRTM_aist/ext/http/rtc.ws.conf @@ -5,6 +5,6 @@ logger.log_level: DEBUG manager.modules.load_path: ./ manager.preload.modules: HTTPTransport.py -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws -ORBendPoint giop:tcp:: corba.nameservers: ws://localhost:2809/ws corba.master_manager: giop:http:ws://localhost:2810/ws diff --git a/OpenRTM_aist/ext/http/rtc.wss.conf b/OpenRTM_aist/ext/http/rtc.wss.conf index 3d4e4992..4e7fdff2 100644 --- a/OpenRTM_aist/ext/http/rtc.wss.conf +++ b/OpenRTM_aist/ext/http/rtc.wss.conf @@ -9,6 +9,6 @@ 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 +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws -ORBendPoint giop:tcp:: corba.nameservers: wss://localhost:2809/ws corba.master_manager: giop:http:wss://localhost:2810/ws diff --git a/OpenRTM_aist/ext/ssl/test/root-sample.crt b/OpenRTM_aist/ext/ssl/test/root-sample.crt new file mode 100644 index 00000000..ae11878b --- /dev/null +++ b/OpenRTM_aist/ext/ssl/test/root-sample.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDozCCAougAwIBAgIUaJOEATvi/3oJwkkrEbl2hLf2g2MwDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB0liYXJha2kxEDAOBgNVBAcMB1Rz +dWt1YmExDTALBgNVBAoMBEFJU1QxDTALBgNVBAsMBElTUkkxEDAOBgNVBAMMB1Rl +c3QgQ0EwHhcNMjYwNDE0MDYwOTIzWhcNMzYwNDExMDYwOTIzWjBhMQswCQYDVQQG +EwJKUDEQMA4GA1UECAwHSWJhcmFraTEQMA4GA1UEBwwHVHN1a3ViYTENMAsGA1UE +CgwEQUlTVDENMAsGA1UECwwESVNSSTEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBANeJGbd/XIe6CDuk5nNFXd4Vza3n7DAI +E9u05I8gYujrr4wGfLfyLjjjoeI0cSDP1jVqnAJivOe6l5stJ7NG3aCloyrxIXIq +twY8yLonkApWsH85XCeM9KEhM1ToUwWIDXHvHV3I2x3ofWYcEOuJe0Pnsf3iLgqY +13sQ8eZBSMTleF+9IxBEIRj5YPkvFMrw7KzX9n+t6g3T0z9C/9vYn9e0P8RL+S7Q +zVDszZG5kNMVxk9fuO6psDfyX5gebHFzcTHZ6kwqC5hmtprjaKNOcO9zuGd5jEtc +lU0ppPGcn4sKlUPeIpR4icr2MpgCEVLgf6VoNMPrE2vtwYNi9knlnmECAwEAAaNT +MFEwHQYDVR0OBBYEFJHPMoDHdczEjMoVA3Nf6OZIDcJsMB8GA1UdIwQYMBaAFJHP +MoDHdczEjMoVA3Nf6OZIDcJsMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBAAoH3C3VCgxjad4UCoDWU2hWQSaHgbsC8oK3zTrostDv9RgxxmgStb39 +R9Tpr/TW1cYBbWAsljkfTvTbP8QjFZG6JxC8vMoN6LTUtMC+1fpAAWqKtbWCBAOq +ZNSNeQPK1Wb3cuL+s12/CraYuGvVAwXADIr8BtHyO+s8gq0G3C04b1tlic5obNKm +VYTuBeu+kUakNuD4OdRioZvWY2XHZO2+s58ZxrzJ1TLzLZGLnqFp9zHJJ3X+1Rup +i36gdbbfBdu1INsf3a1Q98wS9DPAbSFxFfdxP23bp/mN4SIpUdA8DqMftw+FxYDH +ZEYGDmcroj569PpWIwQekQ7+qWDKQXc= +-----END CERTIFICATE----- diff --git a/OpenRTM_aist/ext/ssl/test/root.crt b/OpenRTM_aist/ext/ssl/test/root.crt deleted file mode 100644 index daf2600b..00000000 --- a/OpenRTM_aist/ext/ssl/test/root.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDfjCCAmYCCQDdoe79VxqYFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC -SlAxDzANBgNVBAgTBlNhbXBsZTEPMA0GA1UEBxMGU2FtcGxlMQ8wDQYDVQQKEwZT -YW1wbGUxDzANBgNVBAsTBlNhbXBsZTEPMA0GA1UEAxMGU2FtcGxlMRwwGgYJKoZI -hvcNAQkBFg1TYW1wbGVAU2FtcGxlMB4XDTE2MDMwNzEwMTIwMFoXDTI2MDMwNTEw -MTIwMFowgYAxCzAJBgNVBAYTAkpQMQ8wDQYDVQQIEwZTYW1wbGUxDzANBgNVBAcT -BlNhbXBsZTEPMA0GA1UEChMGU2FtcGxlMQ8wDQYDVQQLEwZTYW1wbGUxDzANBgNV -BAMTBlNhbXBsZTEcMBoGCSqGSIb3DQEJARYNU2FtcGxlQFNhbXBsZTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMR9Ekn9fgrhqDuwLRQd4UFDily8LE4F -5hpPMrVwmvXaBnWxyl/XeBopXE9H8xz4w2u9/d6V3h3CJYMeIjBy9MY16ttMQ2Ye -RBJK8xZlDN0zDN2IQSIn2uVuSQm6Fq1AgtpL8z5XhTMe++hI7vEHfPp3Z1XOshKj -iOKk9dQkz0H8rhWBRf2cW63CF1jZLhqtW4rjUR1A630IM4GdgaIA/i2ejcQFM1XL -jEKkHQnM2qel+LbHhuX2um5VYZEwOFWIJNOizOzmTV1heoN7D5xf8/IWojq+q3ls -a6b80a7fx4Cuskswxd67mVggnkJzMQvBvRQR6UYDvZgyKl7ocdS8k+8CAwEAATAN -BgkqhkiG9w0BAQUFAAOCAQEAPJjCQzXdqpLLTU3q/LSg9SDp11oHOQDsdnCUKiXc -ZEOU2UqhW87x3SRLI6s4L1IMrdm4CUurpDbtVpdp32LNLC06+eEB6W6mYfY6npUX -+kgKtRHnt2RNoo9zY99qn8xSLSqYtz0/LHfpsDHobEdqmAOwgzU2BpyQtNPzzYyp -CciU/1hzhq+iHdD9u2PNUWWZdkqBfko22J4FlyFF+i6nf36hDDeHC5ZXXMnKZZdC -UljZuvuE7pGRuyXJ3ss8ML1lxGFfyzXG1EyaOs+IjingW4aPTbIgabbjQfOPW1Dx -+j5fP1F445Y7f/bi3+dXKeIi8fziKaPe7JUm0fl/E5JIAg== ------END CERTIFICATE----- diff --git a/OpenRTM_aist/ext/ssl/test/server-sample.pem b/OpenRTM_aist/ext/ssl/test/server-sample.pem new file mode 100644 index 00000000..736ef677 --- /dev/null +++ b/OpenRTM_aist/ext/ssl/test/server-sample.pem @@ -0,0 +1,109 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyitN8sxGgO0CAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBG16ZcFx5s7BIIEyGICZR36fZll +Iu774CYVwnpcuRTeBtX+61CWNwjfYrg/cIMyVBSXS8tql0ydKIcRRLx9ZwvZTtq5 +GnZuOez64N39KFPWkv/XCtbMxS0wYbXYFH2+Zy79XgCOVKJFXsU8uptGpF2THkAd +pnPYEYrQmbdAjIpJb2rlC0svK644QxuKxs6QbohWje0gLZw1XfZ8oB0NzylvGiui +L0t5xbUQviOdEbGIXyk8kFh2CC5WTAj4B9MpRgnDRv6rWZqhk1A8Wc3jFX5MMJQI +AH/g8sOgNNENyJgftAdw9N9VLBp1aCpKwSj6RGZfA7s/lFq64aQn2KRu/sWKIf9X +BMDSt5JfQOqSPk+vP38HaVj2r9NbAATg2LqCg+M5oP6y3k/GuZTD9jtQaJ8UvgzJ +uds6C12giYcUe8lGLa2wWaLtzmbc45Kjki+iiYElXwep+THMak3auf9RB1Zzk3Gr +y8zbRE8/Ok+IMomVqvbWY96LHNoiEOq2f5hUoPrQ+SgJC49P+OuDygHdVUmDf+uG +G0Et89hfwZyUpSNH+0nRF0ISVeIm4CCPMyI4iznE3ZHnBHUiousl0GUuEpISvCUV +H8UgsMXYemPgdd9VwlXE29uFabzNxfE6xs6kiptORRz9yIrOTZYnLwU0WFFDnlYe +AqodgEjFKW0nddJ/Tr1IuNQg+a/L7AzaOatXreTS6uD7tGC7jKzY1IZ/lABWfQX5 +SnrJi+rhQNLT3eHPIyFoRH9g5KdqGuYdLlR6f/nV7GOMVrmjNGiPSc59o1KioQRf +a8yNx484Z0PcQ1tSeEHp9arrsyGaTxd4CkaqFmps9qYYflT2qkZH/oyGSsxQ/X7K +Bjin/hHWrZ1Ie4RveBqF71lygBfmkE5a0sGJnMyHqQcGcnW1KL134SRBdFZgM6aK +DqdcB2NsRhf8e0TUfD2X1XDck/Z6VNghCAlgO9Ao2kbu7e7TzI7cxoScK+qwokOq +XN8HzjIeZ/ckybaDHqwfnqAcm9j7/dNvaSsxuXl/H5semcrCXgJceXgb9HvdvKiI +Ohm8lCjq4vNeXrOrMO8z67wKHyP6MYZDEpox5oovhiannKYP0uZ29gh4CH8QRR/J +OqtEI08NKv6zHvD3Ypo/5aEN5wbvIQuYNBxvscnBIQktNgGgdzqAOCIbRl6aTZ4V +eJ3RAcLN285dHZVyCbwQVAgc07VIzTe9W+DNRhN1/nXzoZ2MA5UWI0IHjr/PmwOe +BBQPzZ9qwVwaCbwNxWa8KUbPM3K0cHdZ8ROXbbKqpSUUYJJeAyqjcrb3jHHgH+GK +D7kmkaQIhUaEGznJkp4rizG4zew5WArmycve0VT5H6A5lpV9HNsl0ZNOQjI2a+zq +pzedAhZqXORn4JofUTASeSB3Gj+eUsL2d7URGPh+2HNXri50Gvr144G0VY992OWV +sFhc3LgnEOwjOZzQqEC55MW9r9N2gBPrw2f5Vd6pByXND7k+7FadMYYI3jD4SbhX +z1q7jU7DcnNwlwuLx6oUJJRYsZ3ZHGLzFTD5w+sD2xJqJaSM1V27Cj7mZlm/5P4S +1KS3sJbLqyiCUGv5lel0ifs1nMdEyp8EqrXyTfgf4dGJztoIzWQzAqZrS6TwB0Tb +0WhN6fgf/tWLjdyIZrrDhQ== +-----END ENCRYPTED PRIVATE KEY----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=JP, ST=Ibaraki, L=Tsukuba, O=AIST, OU=ISRI, CN=Test CA + Validity + Not Before: Apr 14 06:38:19 2026 GMT + Not After : Apr 14 06:38:19 2027 GMT + Subject: C=JP, ST=Ibaraki, L=Tsukuba, O=AIST, OU=ISRI, CN=openrtm.org + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:d4:ca:ac:48:fc:9b:5c:7b:c6:40:82:1d:9f:e7: + a4:52:9c:84:23:e5:26:39:86:9a:12:e8:4e:ee:9c: + 72:de:56:04:94:c7:76:13:5a:d1:1f:9e:42:9f:c4: + db:09:9e:6f:69:a7:46:97:f3:e4:67:5c:35:c1:56: + 9a:29:1a:c3:5e:83:5c:9e:c3:6b:65:05:13:67:7c: + d1:01:f1:a0:e9:9b:c1:1e:7e:29:ec:63:8f:a8:a0: + 33:ae:39:2a:50:3f:75:58:fc:39:ed:66:1b:9a:ca: + 94:b3:72:d2:9c:4c:53:c6:a5:cc:b8:46:1c:17:5c: + 4f:f2:21:b5:11:83:f3:01:cf:aa:ad:fa:22:3a:79: + c7:92:8b:7c:5f:88:2d:b5:d8:99:cf:e5:28:92:ef: + f2:19:92:d2:19:01:c2:ca:57:13:02:88:57:80:dc: + 43:34:9c:25:64:01:ad:46:72:23:2f:b0:e3:c2:ad: + 2e:dd:fc:9a:be:df:3d:48:1e:50:99:c5:26:e6:1c: + 5b:46:25:8e:49:46:03:e8:41:e1:e7:23:f2:20:54: + f4:d1:2a:e3:96:6c:2a:0f:3d:43:fb:c7:2a:9a:71: + 8b:21:2f:cf:5a:1e:bd:32:a1:f8:5c:fd:13:8f:fb: + e0:78:44:4e:f1:4d:9f:ba:37:fa:77:42:3a:29:6f: + 86:a1 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 74:75:CD:40:68:74:6E:DE:93:BE:41:CC:75:B6:3D:58:18:30:59:55 + X509v3 Authority Key Identifier: + 91:CF:32:80:C7:75:CC:C4:8C:CA:15:03:73:5F:E8:E6:48:0D:C2:6C + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 21:6a:d4:4c:f4:41:d5:c2:ba:3a:7f:0f:c6:f7:34:c7:c2:0a: + 41:b6:5a:02:df:1f:6e:b6:3a:e9:e9:3a:79:5c:28:70:6c:3a: + 7c:46:65:c4:eb:f8:0a:88:6c:2e:71:28:29:31:65:56:1a:72: + 59:d9:0e:49:1f:93:a5:bc:c0:ca:6d:b9:34:40:15:1a:39:4d: + 46:9c:f2:36:16:41:74:52:ad:fb:c8:f6:97:da:2f:b4:0f:10: + d6:be:f7:09:08:c8:4c:b1:44:04:7b:42:3d:df:f9:83:aa:78: + b6:1d:77:32:7e:cc:0d:b8:79:10:96:b2:18:0d:0c:ed:04:2d: + bc:2c:32:2c:c0:5a:5c:0f:36:03:d0:f2:74:7a:56:9e:5a:7b: + e5:54:51:ec:51:31:92:bd:b8:db:14:e9:86:0f:27:83:04:7e: + 45:7c:de:ae:8b:7a:6d:80:3e:4e:46:af:87:cf:fb:84:68:10: + 08:c9:c8:aa:e9:58:7a:9b:12:7b:33:83:86:b6:e8:7c:64:e0: + fe:2e:ab:65:ae:54:80:f4:d0:0f:3e:6c:35:82:f0:ce:58:8d: + 3f:8b:be:7d:7f:e5:7c:6b:3f:e7:e4:bf:16:6c:83:18:6c:ca: + 42:32:1b:86:cd:b1:2d:de:1f:a5:49:d7:b8:c1:14:fd:ae:4d: + 67:81:83:7e +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJKUDEQ +MA4GA1UECAwHSWJhcmFraTEQMA4GA1UEBwwHVHN1a3ViYTENMAsGA1UECgwEQUlT +VDENMAsGA1UECwwESVNSSTEQMA4GA1UEAwwHVGVzdCBDQTAeFw0yNjA0MTQwNjM4 +MTlaFw0yNzA0MTQwNjM4MTlaMGUxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdJYmFy +YWtpMRAwDgYDVQQHDAdUc3VrdWJhMQ0wCwYDVQQKDARBSVNUMQ0wCwYDVQQLDARJ +U1JJMRQwEgYDVQQDDAtvcGVucnRtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBANTKrEj8m1x7xkCCHZ/npFKchCPlJjmGmhLoTu6cct5WBJTHdhNa +0R+eQp/E2wmeb2mnRpfz5GdcNcFWmikaw16DXJ7Da2UFE2d80QHxoOmbwR5+Kexj +j6igM645KlA/dVj8Oe1mG5rKlLNy0pxMU8alzLhGHBdcT/IhtRGD8wHPqq36Ijp5 +x5KLfF+ILbXYmc/lKJLv8hmS0hkBwspXEwKIV4DcQzScJWQBrUZyIy+w48KtLt38 +mr7fPUgeUJnFJuYcW0YljklGA+hB4ecj8iBU9NEq45ZsKg89Q/vHKppxiyEvz1oe +vTKh+Fz9E4/74HhETvFNn7o3+ndCOilvhqECAwEAAaNNMEswCQYDVR0TBAIwADAd +BgNVHQ4EFgQUdHXNQGh0bt6TvkHMdbY9WBgwWVUwHwYDVR0jBBgwFoAUkc8ygMd1 +zMSMyhUDc1/o5kgNwmwwDQYJKoZIhvcNAQELBQADggEBACFq1Ez0QdXCujp/D8b3 +NMfCCkG2WgLfH262OunpOnlcKHBsOnxGZcTr+AqIbC5xKCkxZVYaclnZDkkfk6W8 +wMptuTRAFRo5TUac8jYWQXRSrfvI9pfaL7QPENa+9wkIyEyxRAR7Qj3f+YOqeLYd +dzJ+zA24eRCWshgNDO0ELbwsMizAWlwPNgPQ8nR6Vp5ae+VUUexRMZK9uNsU6YYP +J4MEfkV83q6Lem2APk5Gr4fP+4RoEAjJyKrpWHqbEnszg4a26Hxk4P4uq2WuVID0 +0A8+bDWC8M5YjT+Lvn1/5XxrP+fkvxZsgxhsykIyG4bNsS3eH6VJ17jBFP2uTWeB +g34= +-----END CERTIFICATE----- diff --git a/OpenRTM_aist/ext/ssl/test/server.pem b/OpenRTM_aist/ext/ssl/test/server.pem deleted file mode 100644 index 34927976..00000000 --- a/OpenRTM_aist/ext/ssl/test/server.pem +++ /dev/null @@ -1,48 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxH0SSf1+CuGoO7AtFB3hQUOKXLwsTgXmGk8ytXCa9doGdbHK -X9d4GilcT0fzHPjDa7393pXeHcIlgx4iMHL0xjXq20xDZh5EEkrzFmUM3TMM3YhB -Iifa5W5JCboWrUCC2kvzPleFMx776Eju8Qd8+ndnVc6yEqOI4qT11CTPQfyuFYFF -/ZxbrcIXWNkuGq1biuNRHUDrfQgzgZ2BogD+LZ6NxAUzVcuMQqQdCczap6X4tseG -5fa6blVhkTA4VYgk06LM7OZNXWF6g3sPnF/z8haiOr6reWxrpvzRrt/HgK6ySzDF -3ruZWCCeQnMxC8G9FBHpRgO9mDIqXuhx1LyT7wIDAQABAoIBADrlMmIzNWCVmxOp -DxoEisxBLmv1i2Inqn0gWBbClfAzVdRZYkuwDjPpSd4JtvlsJ0dYP4xEZ7uLwiq3 -EZBsJKp05tys01b8o3LIPGzuBRkYgDa27K8MOzSiBgqAWOO9fntoYJTDLw3Pr7pE -gjqFABUjTToPJpkno5Qr1fOsxOMGD4EjbFnuH0yWs7H1I8EWDu3ehPIjWNfg2Kcg -mB8FJTFw5P2V/jmDXo+m27sambLfg1aXJVCozLbpp7qTh3GmkTnbFLmrXPpkcSAH -SOUwWfR5yJ7yfiNrJpl1HmOpHseFX8X1mOzXfa43NL8rdWLVzp0Ru3T+fAa46Uiy -5GWUgsECgYEA7r1Rpj9vPinVP+NDT9xvj1oRvZpUecQ4qKYjAca5P+PL5enAbC2S -kx/lm6phQQDSM5B+ciUTxqYSaTX9B34YOHrngMjI3QF42xgsnoYGsnD+7cEcL4Ch -YvppbM4pmyidI1x/nKQuX/flAqDFPiSEvkIl/yhogfUPuqhROqkleDkCgYEA0rHB -dVhj8BOdmoNjcCwTyEg0h8YqLUnBngpt8khDXJ6A4zGl8mCoAS0ZX07C2hABZ8LY -Yb+2UBq/yC/kMNOAW6+tSyQPzIzj8ACzFrD+7e64jqxDLiwR9CC4aCbUetcaKysX -I0EdRc/ua4noEG4NLN0SiM87nfygOIp8+xzg3WcCgYBf3jxEYyK7trbAgfVMw3s0 -+Hk5Rxj3ELmj15slInTPWB1PxO8VQbOjSuK8AM4u+TJvrG1qTsNDOPsZrqld8d+u -BoSiLX6jaOzsJif8vFtCGqf0N2CnHqMwCNh+7ca9XLDFO2avMyrANN6MkJzEGIwJ -jqyNat+UmCDp1p9PzA6U2QKBgQChbET/BbiTwEOYlR+DWpHRedidSasYxZCM6Aqy -fMD3Xgz7hBdTKtCtDgOJbMuGzIp3F+Y2he5FUykqU97tta17EY6gqkFcg3lDcRXE -xdibLLHDxaE259bdhpAiY9WZQ+ItvrbccM/fo95UD/V3WQnJHJtNrBBOC7Ype5kj -v01c8wKBgBc2GfncAkaVGggTZHr+zkpASUTBHX9B6jju8s9X49v88MkO933Pidc6 -eysyFBnIvarhH9nTyDIGvTrrjpLC9/bUT6gPT11Z8cO3W6vrENfru/n8M98gdyXp -fjgVr9jeCjkZo/ccNi3fklx6dpZIEQKo3vfSeKQPOrbD/wkLcXzd ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIDfjCCAmYCCQDdoe79VxqYFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC -SlAxDzANBgNVBAgTBlNhbXBsZTEPMA0GA1UEBxMGU2FtcGxlMQ8wDQYDVQQKEwZT -YW1wbGUxDzANBgNVBAsTBlNhbXBsZTEPMA0GA1UEAxMGU2FtcGxlMRwwGgYJKoZI -hvcNAQkBFg1TYW1wbGVAU2FtcGxlMB4XDTE2MDMwNzEwMTIwMFoXDTI2MDMwNTEw -MTIwMFowgYAxCzAJBgNVBAYTAkpQMQ8wDQYDVQQIEwZTYW1wbGUxDzANBgNVBAcT -BlNhbXBsZTEPMA0GA1UEChMGU2FtcGxlMQ8wDQYDVQQLEwZTYW1wbGUxDzANBgNV -BAMTBlNhbXBsZTEcMBoGCSqGSIb3DQEJARYNU2FtcGxlQFNhbXBsZTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMR9Ekn9fgrhqDuwLRQd4UFDily8LE4F -5hpPMrVwmvXaBnWxyl/XeBopXE9H8xz4w2u9/d6V3h3CJYMeIjBy9MY16ttMQ2Ye -RBJK8xZlDN0zDN2IQSIn2uVuSQm6Fq1AgtpL8z5XhTMe++hI7vEHfPp3Z1XOshKj -iOKk9dQkz0H8rhWBRf2cW63CF1jZLhqtW4rjUR1A630IM4GdgaIA/i2ejcQFM1XL -jEKkHQnM2qel+LbHhuX2um5VYZEwOFWIJNOizOzmTV1heoN7D5xf8/IWojq+q3ls -a6b80a7fx4Cuskswxd67mVggnkJzMQvBvRQR6UYDvZgyKl7ocdS8k+8CAwEAATAN -BgkqhkiG9w0BAQUFAAOCAQEAPJjCQzXdqpLLTU3q/LSg9SDp11oHOQDsdnCUKiXc -ZEOU2UqhW87x3SRLI6s4L1IMrdm4CUurpDbtVpdp32LNLC06+eEB6W6mYfY6npUX -+kgKtRHnt2RNoo9zY99qn8xSLSqYtz0/LHfpsDHobEdqmAOwgzU2BpyQtNPzzYyp -CciU/1hzhq+iHdD9u2PNUWWZdkqBfko22J4FlyFF+i6nf36hDDeHC5ZXXMnKZZdC -UljZuvuE7pGRuyXJ3ss8ML1lxGFfyzXG1EyaOs+IjingW4aPTbIgabbjQfOPW1Dx -+j5fP1F445Y7f/bi3+dXKeIi8fziKaPe7JUm0fl/E5JIAg== ------END CERTIFICATE----- From c2fc13545f3722c05ee9a4748b85af3d81f07796 Mon Sep 17 00:00:00 2001 From: n-kawauchi Date: Fri, 24 Apr 2026 15:38:15 +0900 Subject: [PATCH 5/5] Updated conf files were included in the deb package. --- packages/deb/conf/http/rtc.http.conf | 6 +++--- packages/deb/conf/http/rtc.https.conf | 6 +++--- packages/deb/conf/http/rtc.ws.conf | 6 +++--- packages/deb/conf/http/rtc.wss.conf | 6 +++--- packages/deb/conf/ssl/rtc.ssl.conf | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/deb/conf/http/rtc.http.conf b/packages/deb/conf/http/rtc.http.conf index 9501c03a..080f6bca 100644 --- a/packages/deb/conf/http/rtc.http.conf +++ b/packages/deb/conf/http/rtc.http.conf @@ -5,6 +5,6 @@ logger.log_level: DEBUG manager.modules.load_path: /usr/lib/python3/dist-packages/OpenRTM_aist/ext/http manager.preload.modules: HTTPTransport.py -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call -corba.nameservers: http://127.0.0.1:2809/call -corba.master_manager: giop:http:http://127.0.0.1:2810/call +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call -ORBendPoint giop:tcp:: +corba.nameservers: http://localhost:2809/call +corba.master_manager: giop:http:http://localhost:2810/call diff --git a/packages/deb/conf/http/rtc.https.conf b/packages/deb/conf/http/rtc.https.conf index ef4383a5..287c59a4 100644 --- a/packages/deb/conf/http/rtc.https.conf +++ b/packages/deb/conf/http/rtc.https.conf @@ -9,6 +9,6 @@ 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 -corba.nameservers: https://127.0.0.1:2809/call -corba.master_manager: giop:http:https://127.0.0.1:2810/call +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call -ORBendPoint giop:tcp:: +corba.nameservers: https://localhost:2809/call +corba.master_manager: giop:http:https://localhost:2810/call diff --git a/packages/deb/conf/http/rtc.ws.conf b/packages/deb/conf/http/rtc.ws.conf index 894ddbe7..c926f0db 100644 --- a/packages/deb/conf/http/rtc.ws.conf +++ b/packages/deb/conf/http/rtc.ws.conf @@ -5,6 +5,6 @@ logger.log_level: DEBUG manager.modules.load_path: /usr/lib/python3/dist-packages/OpenRTM_aist/ext/http manager.preload.modules: HTTPTransport.py -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws -corba.nameservers: ws://127.0.0.1:2809/ws -corba.master_manager: giop:http:ws://127.0.0.1:2810/ws +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws -ORBendPoint giop:tcp:: +corba.nameservers: ws://localhost:2809/ws +corba.master_manager: giop:http:ws://localhost:2810/ws diff --git a/packages/deb/conf/http/rtc.wss.conf b/packages/deb/conf/http/rtc.wss.conf index 8aa10ca1..21e15472 100644 --- a/packages/deb/conf/http/rtc.wss.conf +++ b/packages/deb/conf/http/rtc.wss.conf @@ -9,6 +9,6 @@ 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 -corba.nameservers: wss://127.0.0.1:2809/ws -corba.master_manager: giop:http:wss://127.0.0.1:2810/ws +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws -ORBendPoint giop:tcp:: +corba.nameservers: wss://localhost:2809/ws +corba.master_manager: giop:http:wss://localhost:2810/ws diff --git a/packages/deb/conf/ssl/rtc.ssl.conf b/packages/deb/conf/ssl/rtc.ssl.conf index 106d5ca2..233471c0 100644 --- a/packages/deb/conf/ssl/rtc.ssl.conf +++ b/packages/deb/conf/ssl/rtc.ssl.conf @@ -9,5 +9,5 @@ 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 -corba.master_manager: giop:ssl:127.0.0.1:2810 +corba.nameservers: corbaloc:ssliop:localhost:2809 +corba.master_manager: giop:ssl:localhost:2810