Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 13:54:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

switched to ED25519-V3

Browse source
This commit is contained in:
csoler 2020-10-06 21:15:54 +02:00
parent 210518db80
commit ab6688f1eb
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/TorControl/AddOnionCommand.cpp
View file

@ -56,7 +56,9 @@ QByteArray AddOnionCommand::build()
out += " "; out += " ";
out += m_service->privateKey().bytes(); out += m_service->privateKey().bytes();
} else { } else {
out += " NEW:RSA1024"; // this is v2. For v3, use NEW:BEST, or NEW:ED25519-V3 //out += " NEW:RSA1024"; // this is v2. For v3, use NEW:BEST, or NEW:ED25519-V3
//out += " NEW:ED25519-V3"; // this is v3.
out += " NEW:BEST"; // this is v3, but without control of key type. Generates a RSA1024 key on older Tor versions.
} }
foreach (const HiddenService::Target &target, m_service->targets()) { foreach (const HiddenService::Target &target, m_service->targets()) {

6
retroshare-gui/src/TorControl/CryptoKey.cpp
View file

@ -155,11 +155,11 @@ bool CryptoKey::loadFromTorMessage(const QByteArray& b)
if(b.startsWith("RSA1024")) if(b.startsWith("RSA1024"))
std::cerr << " type: RSA-1024 (Tor v2)" << std::endl; std::cerr << " type: RSA-1024 (Tor v2)" << std::endl;
else if(b.startsWith("ED25529-V3")) else if(b.startsWith("ED25519-V3"))
std::cerr << " type: ED25519-V3 (Tor v3)" << std::endl; std::cerr << " type: ED25519-V3 (Tor v3)" << std::endl;
else else if(b.indexOf(':'))
{ {
std::cerr << " unknown type \"" << b.left(b.indexOf(':')).toStdString() << "\"" << std::endl; std::cerr << " unknown type, or bad syntax in key: \"" << b.left(b.indexOf(':')).toStdString() << "\". Not accepted." << std::endl;
return false; return false;
} }