diff options
| author |  Fabio Bas | 2011-02-10 18:54:48 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-02-10 18:54:48 +0000 |
| commit | 9c03c14040b62eee6d2765899ac376140e6ee7b7 (patch) | |
| tree | 825dbed639050ec1677793ee25dfbbc0efa5306c /src/modules | |
| parent | updated italian translation (diff) | |
| download | KVIrc-9c03c14040b62eee6d2765899ac376140e6ee7b7.tar.gz KVIrc-9c03c14040b62eee6d2765899ac376140e6ee7b7.tar.bz2 KVIrc-9c03c14040b62eee6d2765899ac376140e6ee7b7.zip | |
fixed fish key exchange with cryptopp
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5457 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fish/libkvifish.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index 6db1b9b7a..0f2d9c81a 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -86,6 +86,7 @@ #endif #define FISH_KEYLEN 180 + #define SHA256_LEN 32 static bool fish_DH1080_gen(unsigned char ** szPubKey, int * iLen) { @@ -247,13 +248,12 @@ BN_zero(bn); BN_free(bn); - /// SHA256 hash = 32 byte - unsigned char * hashedSecret=(unsigned char *) KviMemory::allocate(32); + unsigned char * hashedSecret=(unsigned char *) KviMemory::allocate(SHA256_LEN); SHA256(secret, secretLen, hashedSecret); KviMemory::free(secret); - szFinalKey.bufferToBase64((char *) hashedSecret, 32); + szFinalKey.bufferToBase64((char *) hashedSecret, SHA256_LEN); //strip the trailing = szFinalKey.stripRight('='); @@ -271,7 +271,7 @@ } CryptoPP::SHA256().CalculateDigest(byteHashedSecret, byteSharedSecret, g_fish_dh->AgreedValueLength()); - szFinalKey.bufferToBase64((char *) byteHashedSecret.BytePtr(), byteHashedSecret.SizeInBytes()); + szFinalKey.bufferToBase64((char *) byteHashedSecret.BytePtr(), SHA256_LEN); //strip the trailing = szFinalKey.stripRight('='); |