diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp
index 27224e7e..8590a328 100644
--- a/src/gui/src/PluginManager.cpp
+++ b/src/gui/src/PluginManager.cpp
@@ -133,7 +133,7 @@ bool PluginManager::savePlugin()
 	QFile file(filename);
 	if (!file.open(QIODevice::WriteOnly)) {
 		emit error(
-				tr("Failed to download plugin '%1' to: %2 \n %3")
+				tr("Failed to download plugin '%1' to: %2\n%3")
 				.arg(m_PluginList.at(m_DownloadIndex))
 				.arg(m_PluginDir)
 				.arg(file.errorString()));
diff --git a/src/gui/src/PluginManager.h b/src/gui/src/PluginManager.h
index e5a6a33e..8426643e 100644
--- a/src/gui/src/PluginManager.h
+++ b/src/gui/src/PluginManager.h
@@ -44,7 +44,6 @@ public slots:
 private:
 	bool savePlugin();
 	QString getPluginUrl(const QString& pluginName);
-	bool checkOpenSslBinary();
 	bool runProgram(
 		const QString& program,
 		const QStringList& args,
@@ -57,7 +56,6 @@ signals:
 	void info(QString i);
 	void downloadNext();
 	void downloadFinished();
-	void openSslBinaryReady();
 
 private:
 	QStringList m_PluginList;
@@ -66,7 +64,6 @@ private:
 	int m_DownloadIndex;
 	DataDownloader m_DataDownloader;
 	CoreInterface m_CoreInterface;
-	QString m_standardOutput;
 	SslCertificate m_SslCertificate;
 };
 
diff --git a/src/gui/src/PluginWizardPage.cpp b/src/gui/src/PluginWizardPage.cpp
index 9c7e3103..1e560b0d 100644
--- a/src/gui/src/PluginWizardPage.cpp
+++ b/src/gui/src/PluginWizardPage.cpp
@@ -108,12 +108,12 @@ void PluginWizardPage::finished()
 void PluginWizardPage::generateCertificate()
 {
 	connect(m_pSslCertificate,
-		SIGNAL(generateCertificateFinished()),
+		SIGNAL(generateFinished()),
 		this,
 		SLOT(finished()));
 
 	connect(m_pSslCertificate,
-		SIGNAL(generateCertificateFinished()),
+		SIGNAL(generateFinished()),
 		m_pThread,
 		SLOT(quit()));
 
diff --git a/src/gui/src/SslCertificate.h b/src/gui/src/SslCertificate.h
index 1e6f8214..e85bc3d4 100644
--- a/src/gui/src/SslCertificate.h
+++ b/src/gui/src/SslCertificate.h
@@ -1,5 +1,21 @@
-#ifndef SSLCERTIFICATE_H
-#define SSLCERTIFICATE_H
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2015 Synergy Si Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
 
 #include "CoreInterface.h"
 
@@ -18,19 +34,14 @@ public slots:
 signals:
 	void error(QString e);
 	void info(QString i);
-	void generateCertificateFinished();
+	void generateFinished();
 
 private:
-	bool checkOpenSslBinary();
-	bool runProgram(
-		const QString& program,
-		const QStringList& args,
-		const QStringList& env);
+	bool runTool(const QStringList& args);
+	void generateFingerprint(const QString& certificateFilename);
 
 private:
 	QString m_ProfileDir;
-	QString m_standardOutput;
+	QString m_ToolOutput;
 	CoreInterface m_CoreInterface;
 };
-
-#endif // SSLCERTIFICATE_H