diff options
Diffstat (limited to 'src/tests/Benchmark.cpp')
| -rw-r--r-- | src/tests/Benchmark.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/Benchmark.cpp b/src/tests/Benchmark.cpp index 7a5413db8..95495a5af 100644 --- a/src/tests/Benchmark.cpp +++ b/src/tests/Benchmark.cpp @@ -24,7 +24,7 @@ #include "PacketDataStream.h" #include "Timer.h" #include "Message.h" -#include "CryptState.h" +#include "crypto/CryptState.h" #include "Mumble.pb.h" class Client : public QThread { @@ -34,7 +34,7 @@ class Client : public QThread { bool sender; struct sockaddr_in srv; unsigned int uiSession; - CryptState crypt; + CryptStateOCB2 crypt; int rcvd; int socket; int seq; @@ -220,16 +220,16 @@ void Client::readyRead() { const std::string &client_nonce = msg.client_nonce(); const std::string &server_nonce = msg.server_nonce(); if (key.size() == AES_BLOCK_SIZE && client_nonce.size() == AES_BLOCK_SIZE && server_nonce.size() == AES_BLOCK_SIZE) - crypt.setKey(reinterpret_cast<const unsigned char *>(key.data()), reinterpret_cast<const unsigned char *>(client_nonce.data()), reinterpret_cast<const unsigned char *>(server_nonce.data())); + crypt.setKey(key, client_nonce, server_nonce); } else if (msg.has_server_nonce()) { const std::string &server_nonce = msg.server_nonce(); if (server_nonce.size() == AES_BLOCK_SIZE) { crypt.uiResync++; - memcpy(crypt.decrypt_iv, server_nonce.data(), AES_BLOCK_SIZE); + crypt.setDecryptIV(server_nonce); } } else { MumbleProto::CryptSetup mpcs; - mpcs.set_client_nonce(std::string(reinterpret_cast<const char *>(crypt.encrypt_iv), AES_BLOCK_SIZE)); + mpcs.set_client_nonce(crypt.getEncryptIV()); sendMessage(mpcs, MessageHandler::CryptSetup); } break; |