[openrtm-commit:03071] r3166 - in branches/RELENG_1_2/OpenRTM-aist/src/ext: . ssl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 1月 17日 (水) 16:05:18 JST
Author: miyamoto
Date: 2018-01-17 16:05:18 +0900 (Wed, 17 Jan 2018)
New Revision: 3166
Added:
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/SSLTransport.cpp
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/root.crt
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/rtc.conf
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/server.pem
Modified:
branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt
Log:
[incompat,->RELENG_1_2] refs #3265
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt 2018-01-17 06:46:09 UTC (rev 3165)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt 2018-01-17 07:05:18 UTC (rev 3166)
@@ -3,3 +3,6 @@
add_subdirectory(sdo)
+if(SSL_ENABLE)
+ add_subdirectory(ssl)
+endif(SSL_ENABLE)
\ No newline at end of file
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/CMakeLists.txt (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-01-17 07:05:18 UTC (rev 3166)
@@ -0,0 +1,51 @@
+cmake_minimum_required (VERSION 2.6)
+
+project (SSLTransport)
+
+
+set(OPENSSL_ROOT ${OPENSSL_ROOT} CACHE PATH "set OPENSSL_ROOT")
+
+
+if(NOT OPENSSL_ROOT)
+ if(UNIX)
+ set(ORB_ROOT "/usr")
+ else(UNIX)
+ message(FATAL_ERROR "Please set OPENSSL_ROOT.")
+ endif(UNIX)
+endif()
+
+set(SSL_INCLUDE_DIR ${OPENSSL_ROOT}/include)
+set(SSL_LINK_DIR ${OPENSSL_ROOT}/lib)
+set(SSL_LIBRARIES libssl libcrypto)
+
+
+link_directories(${ORB_LINK_DIR} ${SSL_LINK_DIR})
+include_directories(
+ ${RTM_INCLUDE_DIR}
+ ${ORB_INCLUDE_DIR}
+ ${${idl_name}_DIR}
+ ${SSL_INCLUDE_DIR}
+ )
+
+ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
+
+
+set(target SSLTransport)
+
+set(srcs SSLTransport.cpp )
+
+
+set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${SSL_LIBRARIES} ${ORBSSL_LIBRARIES})
+
+
+add_library(${target} SHARED ${srcs})
+target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
+add_dependencies(${target} ${RTM_PROJECT_NAME})
+set_target_properties(${target} PROPERTIES PREFIX "")
+
+
+if(WIN32)
+ install(TARGETS ${target} RUNTIME DESTINATION ext/ssl)
+else(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ext/ssl)
+endif(WIN32)
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/SSLTransport.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/SSLTransport.cpp (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/SSLTransport.cpp 2018-01-17 07:05:18 UTC (rev 3166)
@@ -0,0 +1,45 @@
+#include <rtm/Manager.h>
+#include <omniORB4/sslContext.h>
+
+
+
+void SSLTransportSet(RTC::Manager* manager)
+{
+ coil::Properties &prop = manager->getConfig();
+
+
+ sslContext::certificate_authority_file = CORBA::string_dup(prop["corba.ssl.certificate_authority_file"].c_str());
+ sslContext::key_file = CORBA::string_dup(prop["corba.ssl.key_file"].c_str());
+ sslContext::key_file_password = CORBA::string_dup(prop["corba.ssl.key_file_password"].c_str());
+
+
+ std::string corba_args = prop["corba.args"];
+
+ corba_args += " -ORBendPoint giop:ssl::";
+
+ if (!coil::toBool(prop["manager.is_master"], "YES", "NO", true))
+ {
+ if (prop.getProperty("corba.endpoints").empty())
+ {
+ if (prop.getProperty("corba.endpoint").empty())
+ {
+ if (prop["corba.args"].find("-ORBendPoint") == -1)
+ {
+ corba_args += " -ORBendPoint giop:tcp::";
+ }
+ }
+ }
+ }
+ prop.setProperty("corba.args", corba_args);
+
+}
+
+
+extern "C"
+{
+ DLL_EXPORT void SSLTransportInit(RTC::Manager* manager)
+ {
+
+ SSLTransportSet(manager);
+ }
+};
\ No newline at end of file
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/root.crt
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/root.crt (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/root.crt 2018-01-17 07:05:18 UTC (rev 3166)
@@ -0,0 +1,21 @@
+-----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-----
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/rtc.conf
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/rtc.conf (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/rtc.conf 2018-01-17 07:05:18 UTC (rev 3166)
@@ -0,0 +1,10 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+manager.modules.load_path:./,../../../src/ext/ssl/Release/
+manager.preload.modules: SSLTransport.dll
+corba.ssl.certificate_authority_file:root.crt
+corba.ssl.key_file:server.pem
+corba.ssl.key_file_password:password
+corba.args:-ORBclientTransportRule "* ssl, tcp"
\ No newline at end of file
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/server.pem
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/server.pem (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/server.pem 2018-01-17 07:05:18 UTC (rev 3166)
@@ -0,0 +1,48 @@
+-----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-----
More information about the openrtm-commit
mailing list