Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 22:21:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keeping Qt internally for a while and making RsTor Qt-free

Browse source
This commit is contained in:
csoler 2021-06-25 21:46:00 +02:00
parent d7fb3d8bf4
commit f13b0cbe9f
20 changed files with 258 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libretroshare/src/tor/CryptoKey.h
View file

@ -33,7 +33,9 @@
#ifndef CRYPTOKEY_H
#define CRYPTOKEY_H
#include "tor/TorTypes.h"
#include <QString>
#include <QSharedData>
#include <QExplicitlySharedDataPointer>
class CryptoKey
{
@ -55,13 +57,12 @@ public:
bool loadFromData(const QByteArray &data, KeyType type, KeyFormat format = PEM);
bool loadFromFile(const QString &path, KeyType type, KeyFormat format = PEM);
#endif
bool loadFromFile(const std::string& path);
bool loadFromFile(const QString &path);
void clear();
const Tor::TorByteArray& bytes() const { return key_data; }
bool loadFromTorMessage(const Tor::TorByteArray& b);
bool isLoaded() const { return !key_data.empty(); }
const QByteArray bytes() const { return key_data; }
bool loadFromTorMessage(const QByteArray& b);
bool isLoaded() const { return !key_data.isNull(); }
#ifdef TO_REMOVE
bool isPrivate() const;
@ -100,6 +101,6 @@ private:
#endif
};
Tor::TorByteArray torControlHashedPassword(const Tor::TorByteArray& password);
QByteArray torControlHashedPassword(const QByteArray &password);
#endif // CRYPTOKEY_H