andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix clang warnings.

Browse Source 
GitOrigin-RevId: f96c46f526330b6857578689d624d8858380e121
This commit is contained in:
levlam 2018-04-12 20:21:04 +03:00
parent d8c3c2c505
commit 00590f1b72
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/PasswordManager.cpp
View File

@ -94,14 +94,13 @@ void PasswordManager::do_get_secure_secret(bool recursive, string password, opti
return promise.set_error(Status::Error(400, "Failed to get secure secret")); return promise.set_error(Status::Error(400, "Failed to get secure secret"));
} }
auto new_promise = auto new_promise = PromiseCreator::lambda([password, hash = std::move(hash), promise = std::move(promise),
PromiseCreator::lambda([recursive, password, hash = std::move(hash), promise = std::move(promise),
actor_id = actor_id](Result<bool> r_ok) mutable { actor_id = actor_id](Result<bool> r_ok) mutable {
if (r_ok.is_error()) { if (r_ok.is_error()) {
return promise.set_error(r_ok.move_as_error()); return promise.set_error(r_ok.move_as_error());
} }
send_closure(actor_id, &PasswordManager::do_get_secure_secret, false, std::move(password), send_closure(actor_id, &PasswordManager::do_get_secure_secret, false, std::move(password), std::move(hash),
std::move(hash), std::move(promise)); std::move(promise));
}); });
UpdateSettings update_settings; UpdateSettings update_settings;

1
tdactor/test/actors_impl2.cpp
View File

@ -199,7 +199,6 @@ TEST(Actor2, locker_stress) {
std::atomic<int> begin{0}; std::atomic<int> begin{0};
std::atomic<int> ready{0}; std::atomic<int> ready{0};
std::atomic<int> check{0}; std::atomic<int> check{0};
std::atomic<int> finish{0};
std::vector<td::thread> threads; std::vector<td::thread> threads;
for (size_t i = 0; i < threads_n; i++) { for (size_t i = 0; i < threads_n; i++) {
threads.push_back(td::thread([&, id = i] { threads.push_back(td::thread([&, id = i] {

6
tdutils/td/utils/crypto.cpp
View File

@ -469,7 +469,8 @@ Result<BufferSlice> rsa_encrypt_pkcs1_oaep(Slice public_key, Slice data) {
RSA *rsa = pkey->pkey.rsa; RSA *rsa = pkey->pkey.rsa;
int outlen = RSA_size(rsa); int outlen = RSA_size(rsa);
BufferSlice res(outlen); BufferSlice res(outlen);
if (RSA_public_encrypt(narrow_cast<int>(data.size()), const_cast<unsigned char *>(data.ubegin()), res.as_slice().ubegin(), rsa, RSA_PKCS1_OAEP_PADDING) != outlen) { if (RSA_public_encrypt(narrow_cast<int>(data.size()), const_cast<unsigned char *>(data.ubegin()),
res.as_slice().ubegin(), rsa, RSA_PKCS1_OAEP_PADDING) != outlen) {
#else #else
EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pkey, nullptr); EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pkey, nullptr);
if (!ctx) { if (!ctx) {
@ -520,7 +521,8 @@ Result<BufferSlice> rsa_decrypt_pkcs1_oaep(Slice private_key, Slice data) {
RSA *rsa = pkey->pkey.rsa; RSA *rsa = pkey->pkey.rsa;
size_t outlen = RSA_size(rsa); size_t outlen = RSA_size(rsa);
BufferSlice res(outlen); BufferSlice res(outlen);
auto inlen = RSA_private_decrypt(narrow_cast<int>(data.size()), const_cast<unsigned char *>(data.ubegin()), res.as_slice().ubegin(), rsa, RSA_PKCS1_OAEP_PADDING); auto inlen = RSA_private_decrypt(narrow_cast<int>(data.size()), const_cast<unsigned char *>(data.ubegin()),
res.as_slice().ubegin(), rsa, RSA_PKCS1_OAEP_PADDING);
if (inlen == -1) { if (inlen == -1) {
return Status::Error("Cannot decrypt"); return Status::Error("Cannot decrypt");
} }

2
test/tdclient.cpp
View File

@ -242,7 +242,7 @@ class DoAuthentication : public Task {
default: default:
CHECK(false) << "Unexpected authorization state " << to_string(authorization_state); CHECK(false) << "Unexpected authorization state " << to_string(authorization_state);
} }
send_query(std::move(function), [this](auto res) { CHECK(res->get_id() == td_api::ok::ID) << to_string(res); }); send_query(std::move(function), [](auto res) { CHECK(res->get_id() == td_api::ok::ID) << to_string(res); });
} }
void on_authorization_ready() { void on_authorization_ready() {
LOG(INFO) << "GOT AUTHORIZED"; LOG(INFO) << "GOT AUTHORIZED";