diff options
| author | 2018-09-17 17:16:01 +0200 | |
|---|---|---|
| committer | 2018-10-02 15:30:48 +0200 | |
| commit | b4ace6ec6f86079b3bd297f95dfe133240b53e15 (patch) | |
| tree | efbbacb734024ad2b0be5980bf67f553976c2c11 /src/core/telemetry_session.cpp | |
| parent | Port web_service from Citra (diff) | |
| download | yuzu-b4ace6ec6f86079b3bd297f95dfe133240b53e15.tar.gz yuzu-b4ace6ec6f86079b3bd297f95dfe133240b53e15.tar.xz yuzu-b4ace6ec6f86079b3bd297f95dfe133240b53e15.zip | |
Address a bunch of review comments
Diffstat (limited to 'src/core/telemetry_session.cpp')
| -rw-r--r-- | src/core/telemetry_session.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 09c85297a..c02188adc 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp | |||
| @@ -28,11 +28,12 @@ static u64 GenerateTelemetryId() { | |||
| 28 | mbedtls_entropy_context entropy; | 28 | mbedtls_entropy_context entropy; |
| 29 | mbedtls_entropy_init(&entropy); | 29 | mbedtls_entropy_init(&entropy); |
| 30 | mbedtls_ctr_drbg_context ctr_drbg; | 30 | mbedtls_ctr_drbg_context ctr_drbg; |
| 31 | const char* personalization = "yuzu Telemetry ID"; | 31 | std::string personalization = "yuzu Telemetry ID"; |
| 32 | 32 | ||
| 33 | mbedtls_ctr_drbg_init(&ctr_drbg); | 33 | mbedtls_ctr_drbg_init(&ctr_drbg); |
| 34 | mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, | 34 | ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, |
| 35 | (const unsigned char*)personalization, strlen(personalization)); | 35 | reinterpret_cast<const unsigned char*>(personalization.c_str()), |
| 36 | personalization.size()) == 0) | ||
| 36 | ASSERT(mbedtls_ctr_drbg_random(&ctr_drbg, reinterpret_cast<unsigned char*>(&telemetry_id), | 37 | ASSERT(mbedtls_ctr_drbg_random(&ctr_drbg, reinterpret_cast<unsigned char*>(&telemetry_id), |
| 37 | sizeof(u64)) == 0); | 38 | sizeof(u64)) == 0); |
| 38 | 39 | ||
| @@ -88,7 +89,7 @@ u64 RegenerateTelemetryId() { | |||
| 88 | return new_telemetry_id; | 89 | return new_telemetry_id; |
| 89 | } | 90 | } |
| 90 | 91 | ||
| 91 | bool VerifyLogin(std::string username, std::string token) { | 92 | bool VerifyLogin(const std::string& username, const std::string& token) { |
| 92 | #ifdef ENABLE_WEB_SERVICE | 93 | #ifdef ENABLE_WEB_SERVICE |
| 93 | return WebService::VerifyLogin(Settings::values.web_api_url, username, token); | 94 | return WebService::VerifyLogin(Settings::values.web_api_url, username, token); |
| 94 | #else | 95 | #else |
| @@ -120,7 +121,7 @@ TelemetrySession::TelemetrySession() { | |||
| 120 | u64 program_id{}; | 121 | u64 program_id{}; |
| 121 | const Loader::ResultStatus res{System::GetInstance().GetAppLoader().ReadProgramId(program_id)}; | 122 | const Loader::ResultStatus res{System::GetInstance().GetAppLoader().ReadProgramId(program_id)}; |
| 122 | if (res == Loader::ResultStatus::Success) { | 123 | if (res == Loader::ResultStatus::Success) { |
| 123 | std::string formatted_program_id{fmt::format("{:016X}", program_id)}; | 124 | const std::string formatted_program_id{fmt::format("{:016X}", program_id)}; |
| 124 | AddField(Telemetry::FieldType::Session, "ProgramId", formatted_program_id); | 125 | AddField(Telemetry::FieldType::Session, "ProgramId", formatted_program_id); |
| 125 | 126 | ||
| 126 | std::string name; | 127 | std::string name; |