From c50f12dec8bdf946a39c789ee119746c2e07936d Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 19 Mar 2015 01:31:51 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=A4=E3=82=A2=E3=83=B3?= =?UTF-8?q?=E3=83=88=E8=A8=BC=E6=98=8E=E6=9B=B8=E3=81=A8CA=E8=A8=BC?= =?UTF-8?q?=E6=98=8E=E6=9B=B8=E3=81=AE=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@841 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleRestore/NinjaCommunicator.cpp | 22 +++++++++++++++---- .../ConsoleRestore/NinjaCommunicator.h | 2 ++ .../test_NinjaCommunicator.cpp | 10 ++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp index 1ee9c1e..4cf58d4 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp @@ -90,13 +90,22 @@ nn::Result NinjaCommunicator::HttpCommunicationCore(std::string url) ------------------------------------------------------------------------ */ //ルート証明書の設定 COMMON_LOGGER_RESULT_IF_FAILED( - m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_1)); + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CA)); COMMON_LOGGER_RESULT_IF_FAILED( - m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_2)); + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CA_G2)); COMMON_LOGGER_RESULT_IF_FAILED( - m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_3)); + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CA_G3)); COMMON_LOGGER_RESULT_IF_FAILED( - m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_4)); + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CLASS2_CA)); + COMMON_LOGGER_RESULT_IF_FAILED( + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CLASS2_CA_G2)); + COMMON_LOGGER_RESULT_IF_FAILED( + m_HttpCon.SetRootCa(nn::ssl::CACERT_NINTENDO_CLASS2_CA_G3)); + + // クライアント証明書の設定 + COMMON_LOGGER_RESULT_IF_FAILED( + m_HttpCon.SetClientCert(nn::ssl::CLIENTCERT_DEFAULT)); + #ifndef USE_PROD_KEY // 開発用サーバは自己署名証明書なので検証項目を減らす @@ -146,6 +155,11 @@ nn::Result NinjaCommunicator::GetBody(u8 *buf, size_t size) return nn::ResultSuccess(); } +nn::Result NinjaCommunicator::GetSslError(s32* pResultCode) +{ + return m_HttpCon.GetSslError(pResultCode); +} + nn::Result NinjaCommunicator::Finalize() { COMMON_LOGGER_RETURN_RESULT_IF_FAILED( diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h index 09c3d8e..2394076 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h @@ -40,6 +40,8 @@ public: //! @param[in] size バッファサイズ nn::Result GetBody(u8* buf, size_t size); + nn::Result GetSslError(s32* pResultCode); + nn::Result Finalize(); private: diff --git a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp index c6ba578..247ab6c 100644 --- a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp +++ b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp @@ -112,8 +112,16 @@ void TestNinjaCommunicator::GetNsUid() heap.GetAddr()); void* buf = heap.GetAddr(); + nn::Result result = ninja.GetBody(reinterpret_cast(buf), bufSize); NN_TEST_ASSERT( - ninja.GetBody(reinterpret_cast(buf), bufSize).IsSuccess()); + result.IsSuccess()); + if(result.IsFailure()) + { + s32 errorCode; + NN_TEST_ASSERT( + ninja.GetSslError(&errorCode).IsSuccess()); + NN_LOG("errorCode = %d\n", errorCode); + } NN_LOG("%s\n", buf);