sochix/TLSharp
1
0
Fork 0
mirror of https://github.com/sochix/TLSharp.git synced 2026-01-03 15:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix nonce

Browse source
This commit is contained in:
m.navaei 2018-02-14 17:39:27 +03:30
parent 491e8c10a7
commit 1cb332adc5
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Apps/ClientConsoleApp/Program.cs
View file

@ -48,7 +48,7 @@ namespace ClientConsoleApp
int ApiId = int.Parse(ConfigurationManager.AppSettings["ApiId"]);
//string AuthCode = ConfigurationManager.AppSettings["AuthCode"];
string MainPhoneNumber = ConfigurationManager.AppSettings["NumberToAuthenticate"];
var client = new TelegramClient(ApiId, ApiHash);//, null, "session", null, "127.0.0.1", 5000
var client = new TelegramClient(ApiId, ApiHash, null, "session", null, "127.0.0.1", 5000);//
var phoneCodeHash = string.Empty;
authenticated:
Console.WriteLine("Start app");

18
Apps/TlgListenerApplication/Program.cs
View file

@ -80,6 +80,8 @@ namespace TlgListenerApplication
if (!netStream.DataAvailable) continue;
byte[] nonceFromClient = new byte[16];
byte[] servernonce = new byte[16];
byte[] newNonce = new byte[32];
uint responseCode = 0;
const uint step1Constructor = 0x60469778;
const uint step2Constructor = 0xd712e4be;
@ -110,6 +112,10 @@ namespace TlgListenerApplication
else if (responseCode == step2Constructor) //---Step1_PQRequest
{
nonceFromClient = binaryReader2.ReadBytes(16);
servernonce = binaryReader2.ReadBytes(16);
var useless = binaryReader2.ReadBytes(13);
var ciphertext = binaryReader2.ReadBytes(256);
}
}
else
@ -155,13 +161,13 @@ namespace TlgListenerApplication
}
else if (responseCode == step2Constructor)
{
var newnonce = new byte[16];
new Random().NextBytes(newnonce);
//var nonce = new byte[16];
//new Random().NextBytes(nonce);
byte[] answer;
var hashsum = Encoding.UTF8.GetBytes("asdfghjklmnbvcxzasdf");
const uint innerCode = 0xb5890dba;
AESKeyData key = AES.GenerateKeyDataFromNonces(newnonce, newnonce);
AESKeyData key = AES.GenerateKeyDataFromNonces(servernonce, newNonce);
using (var memoryStream = new MemoryStream())
{
using (var binaryWriter = new BinaryWriter(memoryStream))
@ -169,7 +175,7 @@ namespace TlgListenerApplication
binaryWriter.Write(hashsum);
binaryWriter.Write(innerCode);
binaryWriter.Write(nonceFromClient);
binaryWriter.Write(newnonce);
binaryWriter.Write(newNonce);
binaryWriter.Write(123456789);
Serializers.Bytes.write(binaryWriter, new BigInteger(1, BitConverter.GetBytes(777)).ToByteArrayUnsigned());
Serializers.Bytes.write(binaryWriter, new BigInteger(1, BitConverter.GetBytes(888)).ToByteArrayUnsigned());
@ -180,8 +186,8 @@ namespace TlgListenerApplication
outputdata = new Step2_Response()
{
ServerNonce = nonceFromClient,
Nonce = newnonce,
NewNonce = newnonce,
Nonce = servernonce,
NewNonce = newNonce,
EncryptedAnswer = AES.EncryptAES(key, answer)
}.ToBytes();
}

4
TLSharp.Core/Session.cs
View file

@ -26,8 +26,8 @@ namespace TLSharp.Core
public Session Load(string sessionUserId)
{
var sessionFileName = $"{sessionUserId}.dat";
//if (!File.Exists(sessionFileName))
return null;
if (!File.Exists(sessionFileName))
return null;
using (var stream = new FileStream(sessionFileName, FileMode.Open))
{