helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Java dependency for Encryption Key Request

Browse source 
Encryption Key Request is now fully processed using .NET RSA
capabilities
-> Good news, that was the last step for removing IKVM dependencies!
-> So now MCC does not need to use any external library. Yay! :)
-> MCC should now be compatible with Mono (Mac, Linux).
+ Removed no longed needed DLL files (9 MBytes!)
+ State MC 1.7.5 as a supported version.
+ Update version number to MCC 1.7.2
This commit is contained in:
ORelio 2014-03-16 23:04:43 +01:00
parent 01ba55527d
commit 58d7b0734f
8 changed files with 140 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

17
MinecraftClient/MinecraftCom.cs
View file

@ -462,11 +462,9 @@ namespace MinecraftClient
else if (pid == 0x01) //Encryption request
{
string serverID = readNextString();
byte[] Serverkey_RAW = readNextByteArray();
byte[] Serverkey = readNextByteArray();
byte[] token = readNextByteArray();
var PublicServerkey = Crypto.GenerateRSAPublicKey(Serverkey_RAW);
var SecretKey = Crypto.GenerateAESPrivateKey();
return StartEncryption(uuid, sessionID, token, serverID, PublicServerkey, SecretKey);
return StartEncryption(uuid, sessionID, token, serverID, Serverkey);
}
else if (pid == 0x02) //Login successfull
{
@ -477,8 +475,11 @@ namespace MinecraftClient
}
else return false;
}
public bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, java.security.PublicKey serverKey, javax.crypto.SecretKey secretKey)
public bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, byte[] serverKey)
{
System.Security.Cryptography.RSACryptoServiceProvider RSAService = Crypto.DecodeRSAPublicKey(serverKey);
byte[] secretKey = Crypto.GenerateAESPrivateKey();
Console.ForegroundColor = ConsoleColor.DarkGray;
ConsoleIO.WriteLine("Crypto keys & hash generated.");
Console.ForegroundColor = ConsoleColor.Gray;
@ -493,8 +494,8 @@ namespace MinecraftClient
}
//Encrypt the data
byte[] key_enc = Crypto.Encrypt(serverKey, secretKey.getEncoded());
byte[] token_enc = Crypto.Encrypt(serverKey, token);
byte[] key_enc = RSAService.Encrypt(secretKey, false);
byte[] token_enc = RSAService.Encrypt(token, false);
byte[] key_len = BitConverter.GetBytes((short)key_enc.Length); Array.Reverse(key_len);
byte[] token_len = BitConverter.GetBytes((short)token_enc.Length); Array.Reverse(token_len);
@ -505,7 +506,7 @@ namespace MinecraftClient
Send(encryption_response_tosend);
//Start client-side encryption
setEncryptedClient(Crypto.SwitchToAesMode(c.GetStream(), secretKey));
setEncryptedClient(new Crypto.AesStream(c.GetStream(), secretKey));
//Get the next packet
readNextVarInt(); //Skip Packet size (not needed)