diff --git a/ChangeLog b/ChangeLog
index dc52dc5..42b39b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+v0.9.0
+
+* Update to Qt5
+* Fix some compiler warnings
+* Update copyright in About dialog
+* Fix links in About dialog
+
v0.8.1
* Handle empty selection in SRK password dialog correctly
diff --git a/README.md b/README.md
index 0b96327..5a8c8a5 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ The TPM Manager targets Linux, but later releases should be usable with all oper
## Requirements
-Since the TPM Manager is based entirely on the Qt UI framework, corresponding header and library files Qt4 should be in the library path.
-On some linux distributions you have to install the developer version of Qt to have the header files used by TPM Manager.
+Since the TPM Manager is based entirely on the Qt UI framework, corresponding Qt header and library files should be in the library path.
+On some Linux distributions you have to install the developer version of Qt to have the header files used by TPM Manager.
Requirements to build the TPM Manager:
@@ -43,23 +43,22 @@ Requirements to build the TPM Manager:
Install the following packages on a Debian-based Linux, e.g., Ubuntu Linux:
```bash
-sudo apt-get install build-essential libtspi-dev libqt4-dev
+sudo apt-get install build-essential libtspi-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
```
For a Fedora based Linux install the following packages:
```bash
-sudo yum install make automake gcc gcc-c++ qt-devel trousers-devel
+sudo dnf install make automake gcc gcc-c++ qt5-qtbase-devel trousers-devel
```
To use the features of the TPM Manager you need a running TrouSerS daemon.
-The TPM Manager has been successfully compiled under Qt version 4.8.1.
## Building
This package is built using Qt's qmake. qmake automatically generates a makefile from the Qt project file.
```bash
-qmake-qt5
+qmake-qt5 (or simply: qmake)
make
```
diff --git a/src/NewPasswordDialog.hxx b/src/NewPasswordDialog.hxx
index 6fb4fa4..a474c96 100644
--- a/src/NewPasswordDialog.hxx
+++ b/src/NewPasswordDialog.hxx
@@ -55,7 +55,7 @@ public:
* @return New NewPasswordDialog instance
*
*/
- NewPasswordDialog( QWidget * parent = 0, Qt::WindowFlags f = 0 );
+ NewPasswordDialog( QWidget * parent = 0, Qt::WindowFlags f = QFlag( 0 ) );
/**
* @brief Default destructor
diff --git a/src/PasswordDialog.hxx b/src/PasswordDialog.hxx
index 45fcf75..17b679b 100644
--- a/src/PasswordDialog.hxx
+++ b/src/PasswordDialog.hxx
@@ -55,7 +55,7 @@ public:
* @return New PasswordDialog instance
*
*/
- PasswordDialog( QWidget * parent = 0, Qt::WindowFlags f = 0 );
+ PasswordDialog( QWidget * parent = 0, Qt::WindowFlags f = QFlag( 0 ) );
/**
* @brief Default destructor
diff --git a/src/PublicKeyView.cxx b/src/PublicKeyView.cxx
index 5822abd..8c2fcdb 100644
--- a/src/PublicKeyView.cxx
+++ b/src/PublicKeyView.cxx
@@ -49,7 +49,7 @@ void PublicKeyView::setPublicKey( PublicKey &pk )
string algo = pk.getAlgorithm();
myAlgorithm->setText( QString::fromStdString( algo ) );
- myKeySize->setText( QString::fromStdString( pk.getKeySize( algo ) ) );
+ myKeySize->setText( QString::fromStdString( pk.getKeySize() ) );
myEncScheme->setText( QString::fromStdString( pk.getEncryptionScheme() ) );
mySigScheme->setText( QString::fromStdString( pk.getSignatureScheme() ) );
}
diff --git a/src/PublicKeyView.hxx b/src/PublicKeyView.hxx
index abef00c..b83b3b4 100644
--- a/src/PublicKeyView.hxx
+++ b/src/PublicKeyView.hxx
@@ -56,7 +56,7 @@ public:
* @return New PublicKeyView instance
*
*/
- PublicKeyView( QWidget * parent = 0, Qt::WindowFlags f = 0);
+ PublicKeyView( QWidget * parent = 0, Qt::WindowFlags f = QFlag( 0 ) );
/**
* @brief Default destructor
diff --git a/src/SetSRKView.hxx b/src/SetSRKView.hxx
index 3170272..0e36959 100644
--- a/src/SetSRKView.hxx
+++ b/src/SetSRKView.hxx
@@ -56,7 +56,7 @@ public:
* @return New SetSRKView instance
*
*/
- SetSRKView( QWidget * parent = 0, Qt::WindowFlags f = 0 );
+ SetSRKView( QWidget * parent = 0, Qt::WindowFlags f = QFlag( 0 ) );
/**
* @brief Default destructor
diff --git a/src/TPMManager.cxx b/src/TPMManager.cxx
index 8640bf0..2854eb0 100644
--- a/src/TPMManager.cxx
+++ b/src/TPMManager.cxx
@@ -58,7 +58,7 @@
#include "TPMManager.hxx"
-#define VERSION "0.8.1"
+#define VERSION "0.9.0"
//
using namespace std;
using namespace microtss;
@@ -79,7 +79,6 @@ TPM_Manager::TPM_Manager( QWidget * parent, Qt::WindowFlags f)
// connect our custom slots manually
connect ( downloadLink, SIGNAL( linkActivated(const QString&) ), this, SLOT( slotProcessURL(const QString& ) ) );
- connect ( perseusLink, SIGNAL( linkActivated(const QString&) ), this, SLOT( slotProcessURL(const QString& ) ) );
// we can connect all on_(QWidgetName)_(SIGNAL)(Arguments) slots automagically with one function call (req. Qt 4.4)
QMetaObject::connectSlotsByName( parent );
diff --git a/src/TPMManager.hxx b/src/TPMManager.hxx
index 60f7885..26426c2 100644
--- a/src/TPMManager.hxx
+++ b/src/TPMManager.hxx
@@ -59,7 +59,7 @@ public:
* @return New TPM_Manager instance
*
*/
- TPM_Manager( QWidget * parent = 0, Qt::WindowFlags f = 0 );
+ TPM_Manager( QWidget * parent = 0, Qt::WindowFlags f = QFlag( 0 ) );
/**
* @brief Default destructor
diff --git a/src/microtss/PublicKey.cxx b/src/microtss/PublicKey.cxx
index d862d0b..a383fac 100644
--- a/src/microtss/PublicKey.cxx
+++ b/src/microtss/PublicKey.cxx
@@ -244,7 +244,7 @@ const string PublicKey::getSignatureScheme()
return sigscheme;
}
-const string PublicKey::getKeySize( string algorithm )
+const string PublicKey::getKeySize()
{
TSS_RESULT result;
UINT32 attributeSize;
diff --git a/src/microtss/PublicKey.hxx b/src/microtss/PublicKey.hxx
index e7d059e..ee9c335 100644
--- a/src/microtss/PublicKey.hxx
+++ b/src/microtss/PublicKey.hxx
@@ -55,7 +55,7 @@ public:
* @param endorsementKeyHandle Handle of the Endorsement Key
*
*/
- PublicKey( const TSS_HKEY &endorsementKeyHandle );
+ PublicKey( const TSS_HKEY &endorsementKeyHandle );
/**
* @brief Default destructor
@@ -109,7 +109,7 @@ public:
* @return key size of public key (in bits)
*
*/
- const std::string getKeySize( std::string algorithm );
+ const std::string getKeySize();
protected:
diff --git a/ui/TPMManagerBase.ui b/ui/TPMManagerBase.ui
index 095846b..773547d 100644
--- a/ui/TPMManagerBase.ui
+++ b/ui/TPMManagerBase.ui
@@ -2612,10 +2612,8 @@ p, li { white-space: pre-wrap; }
- (c) 2007 - 2011 by
-Christian Stüble (stueble@sirrix.com)
-Anoosheh Zaerin (a.zaerin@sirrix.com)
-René Korthaus (r.korthaus@sirrix.com)
+ (c) 2007 - 2011 Sirrix AG
+(c) 2022 Rohde & Schwarz
For more information, see
@@ -2629,36 +2627,7 @@ For more information, see
-
- <A HREF="https://projects.sirrix.com/trac/tpmmanager">https://projects.sirrix.com/trac/tpmmanager</a>
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 9
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application is part of the TURAYA security framework, see</p></body></html>
-
-
- false
-
-
-
- -
-
-
- <a href="http://www.turaya.org">http://www.turaya.org</a>
+ <A HREF="https://github.com/Rohde-Schwarz/TPMManager">https://github.com/Rohde-Schwarz/TPMManager</a>
Qt::AlignCenter