diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp
index e32e2d2d3..40ec7eafb 100644
--- a/src/crypto/Crypto.cpp
+++ b/src/crypto/Crypto.cpp
@@ -27,6 +27,7 @@
bool Crypto::m_initalized(false);
QString Crypto::m_errorStr;
+QString Crypto::m_backendVersion;
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
static int gcry_qt_mutex_init(void** p_sys)
@@ -80,7 +81,7 @@ bool Crypto::init()
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt);
#endif
- gcry_check_version(0);
+ m_backendVersion = QString::fromLocal8Bit(gcry_check_version(0));
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
if (!checkAlgorithms()) {
@@ -108,6 +109,11 @@ QString Crypto::errorString()
return m_errorStr;
}
+QString Crypto::backendVersion()
+{
+ return QString("libgcrypt ").append(m_backendVersion);
+}
+
bool Crypto::backendSelfTest()
{
return (gcry_control(GCRYCTL_SELFTEST) == 0);
diff --git a/src/crypto/Crypto.h b/src/crypto/Crypto.h
index b801cbb54..1726865ec 100644
--- a/src/crypto/Crypto.h
+++ b/src/crypto/Crypto.h
@@ -29,6 +29,7 @@ public:
static bool initalized();
static bool backendSelfTest();
static QString errorString();
+ static QString backendVersion();
private:
Crypto();
@@ -43,6 +44,7 @@ private:
static bool m_initalized;
static QString m_errorStr;
+ static QString m_backendVersion;
};
#endif // KEEPASSX_CRYPTO_H
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index d4b212d44..6ca02d1aa 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -21,6 +21,7 @@
#include "config-keepassx.h"
#include "version.h"
#include "core/FilePath.h"
+#include "crypto/Crypto.h"
AboutDialog::AboutDialog(QWidget* parent)
: QDialog(parent)
@@ -49,6 +50,12 @@ AboutDialog::AboutDialog(QWidget* parent)
m_ui->label_git->setText(labelText);
}
+ QString libs = QString("%1\n- Qt %2\n- %3")
+ .arg(m_ui->label_libs->text())
+ .arg(QString::fromLocal8Bit(qVersion()))
+ .arg(Crypto::backendVersion());
+ m_ui->label_libs->setText(libs);
+
setAttribute(Qt::WA_DeleteOnClose);
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
}
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index 2effbd414..0a66b602a 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -86,6 +86,13 @@
+ -
+
+
+ Using:
+
+
+
-