Changeset 175

Timestamp:

03/08/10 10:31:10 (6 months ago)

Author:

korthaus

Message:

removed unnecessary commandline outputs

Files:

• changes/tpmmanager-micro/src/tpmmanager.cpp (modified) (2 diffs)
• changes/tpmmanager-micro/ui/tpmmanagerbase.ui (modified) (1 diff)
• trunk/INSTALL (modified) (3 diffs)
• trunk/README (modified) (1 diff)
• trunk/src/tpmmanager.cpp (modified) (3 diffs)
• trunk/ui/tpmmanagerbase.ui (modified) (1 diff)

changes/tpmmanager-micro/src/tpmmanager.cpp

@@ -69 +69 @@
         myTimer()
 {
-        setupUi(this);
-        
-        myProgramLabel->setText( QString::fromAscii("TPM Manager V") + QString::fromAscii(VERSION) );
+    setupUi(this);
+        
+    myProgramLabel->setText( QString::fromAscii("TPM Manager V") + QString::fromAscii(VERSION) );
     connect( buttonOk, SIGNAL( clicked() ), this, SLOT( close() ) );
+
+    // 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 );
    
-   // 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 );
-   
-  struct stat Status;
-  /*return 0 if the file is found.
-   *return -1 if the file is not found.
-   */
-   int tpmdriver = stat( "/dev/tpm", &Status);
-   int tpm0driver = stat( "/dev/tpm0", &Status);
-   if (tpmdriver == 0 || tpm0driver == 0)
-      driverFound->setPixmap( myOkImage );
-   else
-      driverFound->setPixmap( myNokImage );
-
-        try {
-
-        tssFound->setPixmap( myOkImage );
-                
-                if ( TPMInstance.isDisabled() && !TPMInstance.isOwned() )
-                  QMessageBox::information( this, "TPM Not Functional", "The TPM is disabled and no owner is set. You have to enable the TPM in the BIOS to use the functions of the TPM, e.g., to take ownership.\n" );
-        } 
-        catch ( tddl::TDDL_TPM_NotFound &e ) {
-                QMessageBox::critical( this, "Error while trying to communicate with TPM", QString::fromStdString( e.what() ) );
-                cout << e.what() << endl;
-                driverFound->setPixmap( myNokImage );
-                tssFound->setPixmap( myUnknownImage );
-        } catch ( tcs::TPM_Error &e ) {
-                        cout << "Unknown error: " << e.what() << endl;
-        }
-        
-        // Init status & first view
-        initStatusGroup();
-        initStatus();
-        // let the PCRs update every second..
-        connect( &myTimer, SIGNAL( timeout() ), this, SLOT( slotUpdatePCRs() ) );
-        myTimer.start( 1000 );
+    struct stat Status;
+    /*return 0 if the file is found.
+     *return -1 if the file is not found.
+     */
+    int tpmdriver = stat( "/dev/tpm", &Status);
+    int tpm0driver = stat( "/dev/tpm0", &Status);
+    if (tpmdriver == 0 || tpm0driver == 0)
+        driverFound->setPixmap( myOkImage );
+    else
+        driverFound->setPixmap( myNokImage );
+
+    try {
+
+        tssFound->setPixmap( myOkImage );
+        if ( TPMInstance.isDisabled() && !TPMInstance.isOwned() )
+            QMessageBox::information( this, "TPM Not Functional", "The TPM is disabled and no owner is set. You have to enable the TPM in the BIOS to use the functions of the TPM, e.g., to take ownership.\n" );
+
+    } catch ( tddl::TDDL_TPM_NotFound &e ) {
+        QMessageBox::critical( this, "No TPM Driver Found", "A TPM device driver could not be found.\nTPM Manager will quit." );
+        driverFound->setPixmap( myNokImage );
+        tssFound->setPixmap( myUnknownImage );
+        exit(1);
+    } catch ( tcs::TPM_Error &e ) {
+        QMessageBox::critical( this, "Miscellaneous TPM Error", QString::fromStdString( string("An unknown TPM Error occured: ").append( e.what() ) ) );
+    }
+        
+    // Init status & first view
+    initStatusGroup();
+    initStatus();
+    // let the PCRs update every second..
+    connect( &myTimer, SIGNAL( timeout() ), this, SLOT( slotUpdatePCRs() ) );
+    myTimer.start( 1000 );
 }
 
@@ -490 +489 @@
                 TPMInstance.takeOwnership();
         
-                QMessageBox::information( this, "Taking Ownership" , "TPM owner successfully created."  );
-        
-        } catch ( tcs::TPM_DEACTIVATED_Error &e )
-        {
-                QMessageBox::critical( this, "Error: Taking Ownership" , "Sorry. Could not Take Ownership in deactivated mode due to TSS bug. " );
+                QMessageBox::information( this, "Taking Ownership" , "TPM Owner successfully created."  );
+        
+        } catch ( tcs::TPM_DEACTIVATED_Error &e ) {
+                QMessageBox::critical( this, "Taking Ownership Failed" , "Sorry. Could not Take Ownership in deactivated mode due to TSS bug. " );
         } catch ( TPM_DEFEND_LOCK_RUNNING_Error &e ) {
                 std::string msg = "Take Ownership failed (" + string( e.what() ) + ")";
-                QMessageBox::critical( this, "Error: Taking Ownership", QString::fromStdString( msg ) );
+                QMessageBox::critical( this, "Taking Ownership Failed", QString::fromStdString( msg ) );
         } catch ( tcs::TPM_RETRY_Error &e ) {
                 std::string msg = "Take Ownership failed (" + string( e.what() ) + ")";
-                QMessageBox::critical( this, "Error: Taking Ownership", QString::fromStdString( msg ) );
+                QMessageBox::critical( this, "Taking Ownership Failed", QString::fromStdString( msg ) );
         }
         

changes/tpmmanager-micro/ui/tpmmanagerbase.ui

@@ -2927 +2927 @@
                  </property>
                  <property name="text">
-                  <string>(c) 2007 - 2009 by
+                  <string>(c) 2007 - 2010 by
 Christian StÃŒble (stueble@sirrix.com) 
 Anoosheh Zaerin (a.zaerin@sirrix.com) 

trunk/INSTALL

@@ -2 +2 @@
 ==================
 
-   This package is built using Qt's qmake. qmake automatically generates a makefile from the Qt project file.
+This package is built using Qt's qmake. qmake automatically generates a makefile from the Qt project file.
    
 1. Requirements
@@ -8 +8 @@
 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.
 
-The required programs to install the TPM Manager are: 
+Requirements to build the TPM Manager: 
 • Qt4 (>= 4.4)
 • TrouSerS 
-The required packages for (k)ubuntu in detail are: 
+The required packages for (k)Ubuntu in detail are: 
 • build-essential 
 • libtspi-dev 
@@ -27 +27 @@
 your version of Qt prior to compiling TPM Manager as described below.
 
+# qmake -v
+# QMake version 2.01a
+# Using Qt version 4.5.2 in /usr/lib
 
-# tar −xzf tpmmanager−0.8.tar.gz 
-# cd tpmmanager−0.8 
-# qmake −−version 
-# qmake // if qmake −−version returns Qt version 3.x.x, use qmake−qt4 instead 
+If qmake points to a 3.X version of Qt, use qmake-qt4 instead of qmake.
+
+# tar −xzf tpmmanager−0.8.1.tar.gz 
+# cd tpmmanager−0.8.1
+# qmake
 # make 
-# install bin/tpmmanager /path/to/install/directory // e.g., install bin/tpmmanager /usr/local/bin
+# install bin/tpmmanager /path/to/install/directory // e.g., "install bin/tpmmanager /usr/local/bin"
 
 3. Usage
 ========
-make will create the TPM Manager binary in the bin/ subdirectory. You can run make install to install TPM Manager in default binary path of your system. To start TPM Manager, type tpmmanager on terminal or simply double-click the application icon in your file manager.
+Make will create the TPM Manager binary in the bin/ subdirectory. You can run make install to install TPM Manager in default binary path of your system. To start TPM Manager, type tpmmanager on terminal or simply double-click the application icon in your file manager.
+You may also add TPM Manager to your Application starter menu, e.g., in Gnome or KDE.

trunk/README

@@ -1 @@
-For questions, bug reports, and comments, visit http://forum.emscb.org
+For instructions to build and run TPM Manager, see the INSTALL readme file included with this package.
+For general questions, bug reports, and comments, visit http://sourceforge.net/projects/tpmmanager or http://projects.sirrix.com/tpmmanager.

trunk/src/tpmmanager.cpp

@@ -73 +73 @@
         myTimer()
 {
-        setupUi(this);
-        
-        myProgramLabel->setText( QString::fromAscii("TPM Manager V") + QString::fromAscii(VERSION) );
+    setupUi(this);
+        
+    myProgramLabel->setText( QString::fromAscii("TPM Manager V") + QString::fromAscii(VERSION) );
     connect( buttonOk, SIGNAL( clicked() ), this, SLOT( close() ) );
    
-   // 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 );
+    // 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 );
    
-  struct stat Status;
-  /*return 0 if the file is found.
-   *return -1 if the file is not found.
-   */
-   int tpmdriver = stat( "/dev/tpm", &Status);
-   int tpm0driver = stat( "/dev/tpm0", &Status);
-   if (tpmdriver == 0 || tpm0driver == 0)
-      driverFound->setPixmap( myOkImage );
-   else
-      driverFound->setPixmap( myNokImage );
-
-        try {
-      myTSS = new TSS;
-                myTPM = new TPM( myTSS->getContextHandle() );
-
-      tssFound->setPixmap( myOkImage );
-
-                if ( myTPM->isDisabled() && !myTPM->hasOwner() )
-                  QMessageBox::information( this, "TPM Not Functional", "The TPM is disabled and no owner is set. You have to enable the TPM in the BIOS to use the functions of the TPM, e.g., to take ownership.\n" );
-        } 
-        catch ( TPMDriverNotFound &e ) {
-                cout << e.what() << endl;
-                driverFound->setPixmap( myNokImage );
-                tssFound->setPixmap( myUnknownImage );
-        }
-        catch ( TSSSystemNotFound &e ) {
-                cout << e.what() << endl;
-                QMessageBox::information( this, "Error: No TSS found", "A TCG Software Stack (TSS) could not be found. When using TrouSerS, make sure the TrouSerS daemon (tcsd) is running.\nMost functionality will be disabled." );
-                listBox->setEnabled(false);
-        }
-        
-        // Init status & first view
-        initStatusGroup();
-        initStatus();
-        // let the PCRs update every second..
-        connect( &myTimer, SIGNAL( timeout() ), this, SLOT( slotUpdatePCRs() ) );
-        myTimer.start( 1000 );
+    struct stat Status;
+    /*return 0 if the file is found.
+     *return -1 if the file is not found.
+     */
+    int tpmdriver = stat( "/dev/tpm", &Status);
+    int tpm0driver = stat( "/dev/tpm0", &Status);
+    if (tpmdriver == 0 || tpm0driver == 0)
+        driverFound->setPixmap( myOkImage );
+    else
+        driverFound->setPixmap( myNokImage );
+
+    try {
+        myTSS = new TSS;
+        myTPM = new TPM( myTSS->getContextHandle() );
+
+        tssFound->setPixmap( myOkImage );
+
+        if ( myTPM->isDisabled() && !myTPM->hasOwner() ) {
+            QMessageBox::critical( this, "TPM Not Functional", "The TPM is disabled and no TPM Owner is set. You have to enable the TPM in the BIOS to use the functions of the TPM, e.g., to take ownership.\n" );
+        }
+
+    } catch ( TPMDriverNotFound &e ) {
+        QMessageBox::critical( this, "No TPM Driver Found", "A TPM device driver could not be found.\nTPM Manager will quit." );
+        driverFound->setPixmap( myNokImage );
+        tssFound->setPixmap( myUnknownImage );
+        exit(1);
+    } catch ( TSSSystemNotFound &e ) {
+        QMessageBox::critical( this, "No TSS Found", "A TCG Software Stack (TSS) could not be found. When using TrouSerS, make sure the TrouSerS daemon (tcsd) is running.\nTPM Manager will quit." );
+        exit(1);
+    }
+        
+    // Init status & first view
+    initStatusGroup();
+    initStatus();
+    // let the PCRs update every second..
+    connect( &myTimer, SIGNAL( timeout() ), this, SLOT( slotUpdatePCRs() ) );
+    myTimer.start( 1000 );
 }
 
@@ -466 +466 @@
                 QMessageBox::information( this, "Taking Ownership" , "TPM owner successfully created."  );
         
-        } catch ( IsDeactivatedError &e )
-        {
-                QMessageBox::critical( this, "Error: Taking Ownership" , "Sorry. Could not Take Ownership in deactivated mode due to TSS bug. " );
-        } catch ( UnknownError &e )
-        {
+        } catch ( IsDeactivatedError &e ) {
+            QMessageBox::critical( this, "Error: Taking Ownership" , "Sorry. Could not Take Ownership in deactivated mode due to TSS bug. " );
+        } catch ( UnknownError &e ) {
             QMessageBox::critical( this, "Error: Taking Ownership" , QString( "Could not Take Ownership for the following reason: " ).append( QString::fromStdString( e.what() ) ) );
         }
@@ -787 +785 @@
         }
         // refresh TPM status view & options
-        cout << "TPM_Manager::onMyDisable_clicked(): Refreshing status views." << endl;
         initStatusGroup();
         initStatus();

trunk/ui/tpmmanagerbase.ui

@@ -2892 +2892 @@
                  </property>
                  <property name="text">
-                  <string>(c) 2007 - 2009 by
+                  <string>(c) 2007 - 2010 by
 Christian StÃŒble (stueble@sirrix.com) 
 Anoosheh Zaerin (a.zaerin@sirrix.com)