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

Support PBKDF2-SHA512.

Browse Source 
GitOrigin-RevId: cd151b5239a97d5c89dd78f60da24e939ab41445
This commit is contained in:
levlam 2018-08-03 17:24:39 +03:00
parent f162aa55ad
commit 7f62960ad3
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,11 +394,11 @@ void md5(Slice input, MutableSlice output) {
CHECK(result == output.ubegin());
}
void pbkdf2_sha256(Slice password, Slice salt, int iteration_count, MutableSlice dest) {
CHECK(dest.size() == 256 / 8) << dest.size();
CHECK(iteration_count > 0);
auto evp_md = EVP_sha256();
static void pbkdf2_impl(Slice password, Slice salt, int iteration_count, MutableSlice dest, const EVP_MD *evp_md) {
CHECK(evp_md != nullptr);
int hash_size = EVP_MD_size(evp_md);
CHECK(dest.size() == static_cast<size_t>(hash_size));
CHECK(iteration_count > 0);
#if OPENSSL_VERSION_NUMBER < 0x10000000L
HMAC_CTX ctx;
HMAC_CTX_init(&ctx);
@ -411,13 +411,13 @@ void pbkdf2_sha256(Slice password, Slice salt, int iteration_count, MutableSlice
HMAC_CTX_cleanup(&ctx);
if (iteration_count > 1) {
unsigned char buf[32];
unsigned char buf[hash_size];
std::copy(dest.ubegin(), dest.uend(), buf);
for (int iter = 1; iter < iteration_count; iter++) {
if (HMAC(evp_md, password.data(), password_len, buf, 32, buf, nullptr) == nullptr) {
if (HMAC(evp_md, password.data(), password_len, buf, hash_size, buf, nullptr) == nullptr) {
LOG(FATAL) << "Failed to HMAC";
}
for (int i = 0; i < 32; i++) {
for (int i = 0; i < hash_size; i++) {
dest[i] ^= buf[i];
}
}
@ -430,6 +430,14 @@ void pbkdf2_sha256(Slice password, Slice salt, int iteration_count, MutableSlice
#endif
}
void pbkdf2_sha256(Slice password, Slice salt, int iteration_count, MutableSlice dest) {
pbkdf2_impl(password, salt, iteration_count, dest, EVP_sha256());
}
void pbkdf2_sha512(Slice password, Slice salt, int iteration_count, MutableSlice dest) {
pbkdf2_impl(password, salt, iteration_count, dest, EVP_sha512());
}
void hmac_sha256(Slice key, Slice message, MutableSlice dest) {
CHECK(dest.size() == 256 / 8);
unsigned int len = 0;

2
tdutils/td/utils/crypto.h
View File

@ -81,6 +81,8 @@ void sha256_final(Sha256State *state, MutableSlice output);
void md5(Slice input, MutableSlice output);
void pbkdf2_sha256(Slice password, Slice salt, int iteration_count, MutableSlice dest);
void pbkdf2_sha512(Slice password, Slice salt, int iteration_count, MutableSlice dest);
void hmac_sha256(Slice key, Slice message, MutableSlice dest);
// Interface may be improved