DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

change decrypt key to shared

Browse Source
This commit is contained in:
DenioD
2020-06-02 01:24:12 +02:00
parent 1aed6e9ed0
commit 04575afd5a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controller.cpp
View File

@@ -1239,6 +1239,8 @@ void Controller::refreshTransactions() {
if (main->getPubkeyByAddress(requestZaddr) != QString("0xdeadbeef")){ if (main->getPubkeyByAddress(requestZaddr) != QString("0xdeadbeef")){
publickey = main->getPubkeyByAddress(requestZaddr); publickey = main->getPubkeyByAddress(requestZaddr);
qDebug()<<"Incoming Pubkey :"<<publickey;
qDebug()<<"requestZaddr Pubkey :"<<requestZaddr;
}else{ }else{
publickey = ""; publickey = "";
@@ -1293,8 +1295,7 @@ void Controller::refreshTransactions() {
} }
unsigned char server_rx[crypto_kx_SESSIONKEYBYTES], server_tx[crypto_kx_SESSIONKEYBYTES];
unsigned char client_rx[crypto_kx_SESSIONKEYBYTES], client_tx[crypto_kx_SESSIONKEYBYTES];
////////////////Get the pubkey from Bob, so we can create the share key ////////////////Get the pubkey from Bob, so we can create the share key
@@ -1302,11 +1303,12 @@ void Controller::refreshTransactions() {
/////Create the shared key for sending the message /////Create the shared key for sending the message
if (crypto_kx_client_session_keys(client_rx, client_tx, if (crypto_kx_server_session_keys(server_rx, server_tx,
pk, sk, pubkeyBob) != 0) { pk, sk, pubkeyBob) != 0) {
/* Suspicious client public key, bail out */ /* Suspicious client public key, bail out */
} }
const QByteArray ba = QByteArray::fromHex(memo.toLatin1()); const QByteArray ba = QByteArray::fromHex(memo.toLatin1());
const unsigned char *encryptedMemo = reinterpret_cast<const unsigned char *>(ba.constData()); const unsigned char *encryptedMemo = reinterpret_cast<const unsigned char *>(ba.constData());
@@ -1335,7 +1337,7 @@ void Controller::refreshTransactions() {
/////Our decrypted message is now in decrypted. We need it as QString to render it /////Our decrypted message is now in decrypted. We need it as QString to render it
/////Only the QString gives weird data, so convert first to std::string /////Only the QString gives weird data, so convert first to std::string
// crypto_secretstream_xchacha20poly1305_keygen(client_rx); // crypto_secretstream_xchacha20poly1305_keygen(client_rx);
if (crypto_secretstream_xchacha20poly1305_init_pull(&state, header, client_rx) != 0) { if (crypto_secretstream_xchacha20poly1305_init_pull(&state, header, server_tx) != 0) {
/* Invalid header, no need to go any further */ /* Invalid header, no need to go any further */
} }