PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

proper handshake messages hash calculations

pull/163/head
orignal 10 years ago
parent
64a4799c8c
commit
d1b26b72e3
1 changed files with 11 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      Reseed.cpp

23
Reseed.cpp
Unescape View File

@ -563,14 +563,14 @@ namespace data
CryptoPP::SHA256 finishedHash; CryptoPP::SHA256 finishedHash;
// send ClientHello // send ClientHello
site.write ((char *)clientHello, sizeof (clientHello)); site.write ((char *)clientHello, sizeof (clientHello));
finishedHash.Update (clientHello, sizeof (clientHello)); finishedHash.Update (clientHello + 5, sizeof (clientHello) - 5);
// read ServerHello // read ServerHello
uint8_t type; uint8_t type;
site.read ((char *)&type, 1); finishedHash.Update ((uint8_t *)&type, 1); site.read ((char *)&type, 1);
uint16_t version; uint16_t version;
site.read ((char *)&version, 2); finishedHash.Update ((uint8_t *)&version, 2); site.read ((char *)&version, 2);
uint16_t length; uint16_t length;
site.read ((char *)&length, 2); finishedHash.Update ((uint8_t *)&length, 2); site.read ((char *)&length, 2);
length = be16toh (length); length = be16toh (length);
char * serverHello = new char[length]; char * serverHello = new char[length];
site.read (serverHello, length); site.read (serverHello, length);
@ -582,9 +582,9 @@ namespace data
LogPrint (eLogError, "Unexpected handshake type ", (int)serverHello[0]); LogPrint (eLogError, "Unexpected handshake type ", (int)serverHello[0]);
delete[] serverHello; delete[] serverHello;
// read Certificate // read Certificate
site.read ((char *)&type, 1); finishedHash.Update ((uint8_t *)&type, 1); site.read ((char *)&type, 1);
site.read ((char *)&version, 2); finishedHash.Update ((uint8_t *)&version, 2); site.read ((char *)&version, 2);
site.read ((char *)&length, 2); finishedHash.Update ((uint8_t *)&length, 2); site.read ((char *)&length, 2);
length = be16toh (length); length = be16toh (length);
char * certificate = new char[length]; char * certificate = new char[length];
site.read (certificate, length); site.read (certificate, length);
@ -600,9 +600,9 @@ namespace data
LogPrint (eLogError, "Unexpected handshake type ", (int)certificate[0]); LogPrint (eLogError, "Unexpected handshake type ", (int)certificate[0]);
delete[] certificate; delete[] certificate;
// read ServerHelloDone // read ServerHelloDone
site.read ((char *)&type, 1); finishedHash.Update ((uint8_t *)&type, 1); site.read ((char *)&type, 1);
site.read ((char *)&version, 2); finishedHash.Update ((uint8_t *)&version, 2); site.read ((char *)&version, 2);
site.read ((char *)&length, 2); finishedHash.Update ((uint8_t *)&length, 2); site.read ((char *)&length, 2);
length = be16toh (length); length = be16toh (length);
char * serverHelloDone = new char[length]; char * serverHelloDone = new char[length];
site.read (serverHelloDone, length); site.read (serverHelloDone, length);
@ -622,14 +622,13 @@ namespace data
// send ClientKeyExchange // send ClientKeyExchange
site.write ((char *)clientKeyExchange, sizeof (clientKeyExchange)); site.write ((char *)clientKeyExchange, sizeof (clientKeyExchange));
site.write ((char *)encrypted, 256); site.write ((char *)encrypted, 256);
finishedHash.Update (clientKeyExchange, sizeof (clientKeyExchange)); finishedHash.Update (clientKeyExchange + 5, sizeof (clientKeyExchange) - 5);
finishedHash.Update (encrypted, 256); finishedHash.Update (encrypted, 256);
uint8_t masterSecret[48], random[64]; uint8_t masterSecret[48], random[64];
memcpy (random, clientHello + 11, 32); memcpy (random, clientHello + 11, 32);
memcpy (random + 32, serverRandom, 32); memcpy (random + 32, serverRandom, 32);
// send ChangeCipherSpecs // send ChangeCipherSpecs
site.write ((char *)changeCipherSpecs, sizeof (changeCipherSpecs)); site.write ((char *)changeCipherSpecs, sizeof (changeCipherSpecs));
finishedHash.Update (changeCipherSpecs, sizeof (changeCipherSpecs));
// calculate master secret // calculate master secret
PRF (secret, "master secret", random, 64, 48, masterSecret); PRF (secret, "master secret", random, 64, 48, masterSecret);
// expand master secret // expand master secret

Write Preview
Loading…
Cancel
Save