GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed DiffieHellman issues

Browse Source
This commit is contained in:
Albin Corén 2018-03-30 23:38:10 +02:00
parent a7dfddf621
commit bd4b685e84
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -580,8 +580,8 @@ namespace MLAPI
byte[] aesKey = new byte[0];
if(NetworkConfig.EnableEncryption)
{
ushort diffiePublicSize = reader.ReadUInt16();
byte[] diffiePublic = reader.ReadBytes(diffiePublicSize);
ushort diffiePublicSize = messageReader.ReadUInt16();
byte[] diffiePublic = messageReader.ReadBytes(diffiePublicSize);
diffieHellmanPublicKeys.Add(clientId, diffiePublic);
/*
EllipticDiffieHellman diffieHellman = new EllipticDiffieHellman(EllipticDiffieHellman.DEFAULT_CURVE, EllipticDiffieHellman.DEFAULT_GENERATOR, EllipticDiffieHellman.DEFAULT_ORDER);
@ -619,8 +619,8 @@ namespace MLAPI
if (NetworkConfig.EnableEncryption)
{
ushort keyLength = reader.ReadUInt16();
clientAesKey = clientDiffieHellman.GetSharedSecret(reader.ReadBytes(keyLength));
ushort keyLength = messageReader.ReadUInt16();
clientAesKey = clientDiffieHellman.GetSharedSecret(messageReader.ReadBytes(keyLength));
}
float netTime = messageReader.ReadSingle();

4
MLAPI/NetworkingManagerComponents/DiffieHellman.cs
View File

@ -85,7 +85,7 @@ namespace MLAPI.NetworkingManagerComponents
{
v.GetInternalState(out uint[] digits, out bool negative);
byte[] b = DigitConverter.ToBytes(digits);
byte[] b1 = new byte[b.Length];
byte[] b1 = new byte[b.Length + 1];
Array.Copy(b, b1, b.Length);
b1[b.Length] = (byte)(negative ? 1 : 0);
return b1;
@ -98,7 +98,7 @@ namespace MLAPI.NetworkingManagerComponents
uint[] u = DigitConverter.FromBytes(b1);
return new IntX(u, b[b.Length - 1]==1);
}
public static bool BitAt(this uint[] data, long index) => (data[index/8]&(1<<(int)(index%8)))!=0;
public static bool BitAt(this uint[] data, long index) => (data[index / 32] & (1 << (int)(index % 32))) != 0;
public static IntX Abs(this IntX i) => i < 0 ? -i : i;
}
}