Changed filenames in app data directory #4525

- Changed `ssl` to `SSL`
- Moved pem file to `SSL`
This commit is contained in:
Nick Bolton 2015-04-20 16:40:50 +01:00
parent 97060d9698
commit aa9504f43e
2 changed files with 20 additions and 6 deletions

View File

@ -22,10 +22,10 @@
#include <QDir> #include <QDir>
#include <QTextStream> #include <QTextStream>
static const char kDirName[] = "ssl/fingerprints"; static const char kDirName[] = "SSL/Fingerprints";
static const char kLocalFilename[] = "local.txt"; static const char kLocalFilename[] = "Local.txt";
static const char kTrustedServersFilename[] = "trusted-servers.txt"; static const char kTrustedServersFilename[] = "TrustedServers.txt";
static const char kTrustedClientsFilename[] = "trusted-clients.txt"; static const char kTrustedClientsFilename[] = "TrustedClients.txt";
Fingerprint::Fingerprint(const QString& filename) Fingerprint::Fingerprint(const QString& filename)
{ {

View File

@ -40,6 +40,7 @@ static const char kLinuxProcessorArchRpm64[] = "Linux-x86_64-rpm";
static QString kCertificateLifetime = "365"; static QString kCertificateLifetime = "365";
static QString kCertificateSubjectInfo = "/CN=Synergy"; static QString kCertificateSubjectInfo = "/CN=Synergy";
static QString kCertificateFilename = "Synergy.pem"; static QString kCertificateFilename = "Synergy.pem";
static QString kSslDir = "SSL";
static QString kUnixOpenSslCommand = "openssl"; static QString kUnixOpenSslCommand = "openssl";
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -151,10 +152,23 @@ void PluginManager::generateCertificate()
arguments.append("-newkey"); arguments.append("-newkey");
arguments.append("rsa:1024"); arguments.append("rsa:1024");
QString sslDirPath = QString("%1%2%3")
.arg(m_ProfileDir)
.arg(QDir::separator())
.arg(kSslDir);
QDir sslDir(sslDirPath);
if (!sslDir.exists()) {
sslDir.mkdir(".");
}
QString filename = QString("%1%2%3")
.arg(sslDirPath)
.arg(QDir::separator())
.arg(kCertificateFilename);
// key output filename // key output filename
arguments.append("-keyout"); arguments.append("-keyout");
QString filename = m_ProfileDir;
filename.append(QDir::separator()).append(kCertificateFilename);
arguments.append(filename); arguments.append(filename);
// certificate output filename // certificate output filename