procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Closed beta 1000014001: fixed Xcode build.

This commit is contained in:
John Preston 2017-02-25 20:46:21 +03:00
parent 6b70cc342a
commit bcec2f6b84
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/localstorage.cpp
View File

@ -146,7 +146,7 @@ auto PassKey = MTP::AuthKeyPtr();
auto LocalKey = MTP::AuthKeyPtr(); auto LocalKey = MTP::AuthKeyPtr();
void createLocalKey(const QByteArray &pass, QByteArray *salt, MTP::AuthKeyPtr *result) { void createLocalKey(const QByteArray &pass, QByteArray *salt, MTP::AuthKeyPtr *result) {
auto key = MTP::AuthKey::Data { 0 }; auto key = MTP::AuthKey::Data { { 0 } };
auto iterCount = pass.size() ? LocalEncryptIterCount : LocalEncryptNoPwdIterCount; // dont slow down for no password auto iterCount = pass.size() ? LocalEncryptIterCount : LocalEncryptNoPwdIterCount; // dont slow down for no password
auto newSalt = QByteArray(); auto newSalt = QByteArray();
if (!salt) { if (!salt) {
@ -923,7 +923,7 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting
case dbiKey: { case dbiKey: {
qint32 dcId; qint32 dcId;
MTP::AuthKey::Data key = { 0 }; auto key = MTP::AuthKey::Data { { 0 } };
stream >> dcId; stream >> dcId;
stream.readRawData(key.data(), key.size()); stream.readRawData(key.data(), key.size());
if (!_checkStreamStatus(stream)) return false; if (!_checkStreamStatus(stream)) return false;
@ -1858,7 +1858,7 @@ ReadMapState _readMap(const QByteArray &pass) {
LOG(("App Info: could not decrypt pass-protected key from map file, maybe bad password...")); LOG(("App Info: could not decrypt pass-protected key from map file, maybe bad password..."));
return ReadMapPassNeeded; return ReadMapPassNeeded;
} }
auto key = MTP::AuthKey::Data { 0 }; auto key = MTP::AuthKey::Data { { 0 } };
if (keyData.stream.readRawData(key.data(), key.size()) != key.size() || !keyData.stream.atEnd()) { if (keyData.stream.readRawData(key.data(), key.size()) != key.size() || !keyData.stream.atEnd()) {
LOG(("App Error: could not read pass-protected key from map file")); LOG(("App Error: could not read pass-protected key from map file"));
return ReadMapFailed; return ReadMapFailed;

2
Telegram/SourceFiles/mtproto/auth_key.h
View File

@ -111,7 +111,7 @@ private:
Type _type = Type::Generated; Type _type = Type::Generated;
DcId _dcId = 0; DcId _dcId = 0;
Data _key = { 0 }; Data _key = { { 0 } };
KeyId _keyId = 0; KeyId _keyId = 0;
}; };

2
Telegram/SourceFiles/mtproto/connection.h
View File

@ -264,7 +264,7 @@ private:
struct AuthKeyCreateStrings { struct AuthKeyCreateStrings {
QByteArray dh_prime; QByteArray dh_prime;
QByteArray g_a; QByteArray g_a;
AuthKey::Data auth_key = { 0 }; AuthKey::Data auth_key = { { 0 } };
}; };
std::unique_ptr<AuthKeyCreateData> _authKeyData; std::unique_ptr<AuthKeyCreateData> _authKeyData;
std::unique_ptr<AuthKeyCreateStrings> _authKeyStrings; std::unique_ptr<AuthKeyCreateStrings> _authKeyStrings;

1
Telegram/SourceFiles/pspecific_mac.cpp
View File

@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "localstorage.h" #include "localstorage.h"
#include "passcodewidget.h" #include "passcodewidget.h"
#include "mainwindow.h"
#include "history/history_location_manager.h" #include "history/history_location_manager.h"
#include <execinfo.h> #include <execinfo.h>