Changeset 176

Timestamp:

03/08/10 11:37:04 (6 months ago)

Author:

korthaus

Message:

added better error handling, renamed source files (h, cpp)->(hxx, cxx) for convenience

Location:

trunk

Files:

• src/Main.cxx (moved) (moved from trunk/src/main.cpp) (2 diffs)
• src/NewPasswordDialog.cxx (moved) (moved from trunk/src/NewPasswordDialog.cpp) (2 diffs)
• src/NewPasswordDialog.hxx (moved) (moved from trunk/src/NewPasswordDialog.h) (1 diff)
• src/PasswordDialog.cxx (moved) (moved from trunk/src/PasswordDialog.cpp) (2 diffs)
• src/PasswordDialog.hxx (moved) (moved from trunk/src/PasswordDialog.h) (1 diff)
• src/PublicKeyView.cxx (moved) (moved from trunk/src/PublicKeyView.cpp) (2 diffs)
• src/PublicKeyView.hxx (moved) (moved from trunk/src/PublicKeyView.h) (1 diff)
• src/SetSRKView.cxx (moved) (moved from trunk/src/SetSRKView.cpp) (1 diff)
• src/SetSRKView.hxx (moved) (moved from trunk/src/SetSRKView.h) (1 diff)
• src/TPMManager.cxx (moved) (moved from trunk/src/tpmmanager.cpp) (16 diffs)
• src/TPMManager.hxx (moved) (moved from trunk/src/tpmmanager.h) (1 diff)
• src/microtss/PublicKey.cxx (moved) (moved from trunk/src/microtss/PublicKey.cpp) (2 diffs)
• src/microtss/PublicKey.hxx (moved) (moved from trunk/src/microtss/PublicKey.h) (1 diff)
• src/microtss/TPM.cxx (moved) (moved from trunk/src/microtss/TPM.cpp) (2 diffs)
• src/microtss/TPM.hxx (moved) (moved from trunk/src/microtss/TPM.h) (2 diffs)
• src/microtss/TSS.cxx (moved) (moved from trunk/src/microtss/TSS.cpp) (2 diffs)
• src/microtss/TSS.hxx (moved) (moved from trunk/src/microtss/TSS.h) (1 diff)
• tpmmanager.pro (modified) (2 diffs)
• ui/PublicKeyView.ui (moved) (moved from trunk/ui/publickeyview.ui)
• ui/SetSRKDialog.ui (moved) (moved from trunk/ui/setsrkdialog.ui)
• ui/TPMManagerBase.ui (moved) (moved from trunk/ui/tpmmanagerbase.ui)

trunk/src/Main.cxx

@@ -37 +37 @@
 
 /**
-* @file main.cpp
+* @file Main.cxx
 *
 * @brief TPM Manager Main Application File
@@ -44 +44 @@
 
 #include <QApplication>
-#include "tpmmanager.h"
+#include "TPMManager.hxx"
 #include <string.h>
 /// Main application loop

trunk/src/NewPasswordDialog.cxx

@@ -22 +22 @@
 
 /**
-* @file NewPasswordDialog.cpp
+* @file NewPasswordDialog.cxx
 *
 * @brief New Password Dialog Class Implementation File
@@ -28 +28 @@
 **/
 
-#include "NewPasswordDialog.h"
+#include "NewPasswordDialog.hxx"
 
 NewPasswordDialog::NewPasswordDialog( QWidget * parent, Qt::WFlags f) 

trunk/src/NewPasswordDialog.hxx

@@ -28 +28 @@
 
 /**
-* @file NewPasswordDialog.h
+* @file NewPasswordDialog.hxx
 *
 * @brief New Password Dialog Class Header File

trunk/src/PasswordDialog.cxx

@@ -22 +22 @@
 
 /**
-* @file PasswordDialog.cpp
+* @file PasswordDialog.cxx
 *
 * @brief Password Dialog Class Implementation File
@@ -28 +28 @@
 **/
 
-#include "PasswordDialog.h"
+#include "PasswordDialog.hxx"
 #include <iostream>
 

trunk/src/PasswordDialog.hxx

@@ -28 +28 @@
 
 /**
-* @file PasswordDialog.h
+* @file PasswordDialog.hxx
 *
 * @brief Password Dialog Class Header File

trunk/src/PublicKeyView.cxx

@@ -22 +22 @@
 
 /**
-* @file PublicKeyView.cpp
+* @file PublicKeyView.cxx
 *
 * @brief Public Key Dialog Class Implementation File
@@ -28 +28 @@
 **/
 
-#include "PublicKeyView.h"
+#include "PublicKeyView.hxx"
 #include <QLabel>
 #include <QString>

trunk/src/PublicKeyView.hxx

@@ -25 +25 @@
 //
 #include <QDialog>
-#include "ui_publickeyview.h"
-#include <microtss/PublicKey.h>
+#include "ui_PublicKeyView.h"
+#include <microtss/PublicKey.hxx>
 
 /**
-* @file PublicKeyView.h
+* @file PublicKeyView.hxx
 *
 * @brief Public Key Dialog Class Header File

trunk/src/SetSRKView.cxx

@@ -28 +28 @@
 **/
 
-#include "SetSRKView.h"
+#include "SetSRKView.hxx"
 #include <iostream>
 #include <QString>

trunk/src/SetSRKView.hxx

@@ -25 +25 @@
 //
 #include <QDialog>
-#include "ui_setsrkdialog.h"
+#include "ui_SetSRKDialog.h"
 #include <QRadioButton>
 
 /**
-* @file SetSRKView.h
+* @file SetSRKView.hxx
 *
 * @brief SRK Password Choose Dialog Class Header File

trunk/src/TPMManager.cxx

@@ -22 +22 @@
 
 /**
-* @file tpmmanager.cpp
+* @file TPMManager.cxx
 *
 * @brief TPM Manager Controller Class Implementation File
@@ -28 +28 @@
 **/
 
-#include <microtss/TSS.h>
-#include <SetSRKView.h>
 #include <iostream>
 #include <sstream>
@@ -52 +50 @@
 #include <QUrl>
 // 
-#include <microtss/PublicKey.h>
-#include <PublicKeyView.h>
-#include <PasswordDialog.h>
-#include <NewPasswordDialog.h>
-
-#include "tpmmanager.h"
+#include <microtss/TSS.hxx>
+#include <microtss/PublicKey.hxx>
+#include <SetSRKView.hxx>
+#include <PublicKeyView.hxx>
+#include <PasswordDialog.hxx>
+#include <NewPasswordDialog.hxx>
+
+#include "TPMManager.hxx"
 
 #define VERSION "0.8.1"
@@ -113 +113 @@
         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);
+    } catch ( ... ) {
+        QMessageBox::critical( this, "Unknown Error", "An unknown error occured during initialization." );
     }
         
@@ -467 +469 @@
         
         } catch ( IsDeactivatedError &e ) {
-            QMessageBox::critical( this, "Error: Taking Ownership" , "Sorry. Could not Take Ownership in deactivated mode due to TSS bug. " );
+            QMessageBox::critical( this, "Taking Ownership Failed" , "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() ) ) );
+            QMessageBox::critical( this, "Taking Ownership Failed" , QString( "Could not Take Ownership for the following reason: " ).append( QString::fromStdString( e.what() ) ) );
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured during Taking Ownership." );
         }
-
-
         
         /* finally re-enable to Take button (may get disabled by initOwnership() again afterwards) */
@@ -504 +506 @@
                 QMessageBox::information( this, "Changing TPM Owner Password" , "TPM owner password successfully changed." );
 
-        } catch( TPMError &e )
-        {
+        } catch( TPMError &e ) {
                 string err = "Error while changing owner password.\n" + string( e.what() );
                 QMessageBox::critical( this, "TPM Error", QString::fromStdString( err ));
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to change TPM Owner password." );
+        }
+
         // update GUI
         initOwnership();
@@ -557 +561 @@
                 string err = "Unknown error while changing SRK password: \n" + string( e.what() );
                 QMessageBox::critical( this, "TPM Error", QString::fromStdString( err ));
-        }       
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to change SRK password." );
+        }
         // update GUI
         initOwnership();
@@ -583 +589 @@
                 string err = "Error while clearing ownership. \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: Clear Ownership", QString::fromStdString( err ) );
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to clear TPM Ownership." );
+        }
         // update GUI
         initStatus();
@@ -632 +640 @@
                 string err = "Error while deactivating TPM. \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: Deactivate TPM", QString::fromStdString( err ) );
-        }
-        
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to deactivate TPM." );
+        }
         
         // refresh TPM status view & options
@@ -762 +771 @@
                         QMessageBox::information( this, "Disabling the TPM", "TPM successfully disabled." );
                 } catch ( TPMError &e ) {
-                string err = "Authentication failure. \n" + string( e.what() );
-                QMessageBox::critical( this, "Error when disabling the TPM" , QString::fromStdString( err ) );
-                }
+                    string err = "Authentication failure. \n" + string( e.what() );
+                    QMessageBox::critical( this, "Error when disabling the TPM" , QString::fromStdString( err ) );
+                } catch ( ... ) {
+                    QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to disable TPM." );
+                }
         }
         else
@@ -782 +793 @@
                         string err = "Authentication failure. \n" + string( e.what() );
                         QMessageBox::critical( this, "Error when enabling the TPM", QString::fromStdString( err ) );
-                }
+                } catch ( ... ) {
+                    QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to enable TPM." );
+                }
         }
         // refresh TPM status view & options
@@ -818 +831 @@
                 string err = "Authentication failure. \n" + string( e.what() );
                 QMessageBox::critical( this, "Error when trying to get Endorsement Key" , QString::fromStdString( err ) );
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to retrieve TPM Endorsement Key." );
+        }
 }
 
@@ -848 +863 @@
         } catch ( TPMError &e ) {
                 string err = "Authentication failure. \n" + string( e.what() );
-                QMessageBox::critical( this, "Error when trying to save Endorsement Key", QString::fromStdString( err ) );
-        }
+                QMessageBox::critical( this, "Error when trying to store TPM Endorsement Key", QString::fromStdString( err ) );
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to store TPM Endorsement Key." );
+        }
 
 }
@@ -859 +876 @@
         PasswordDialog passDlg( this );
         passDlg.setPrompt( "Enter Owner Password" );
-        passDlg.setDescription( "Enter owner password to restrict viewing public endorsement key information without owner authorization. " );
+        passDlg.setDescription( "Enter owner password to restrict viewing public TPM Endorsement Key information without owner authorization. " );
 
         if ( passDlg.exec() == QDialog::Rejected )
@@ -873 +890 @@
                 string err =  "Error: Restrict Endorsement Key. \n" + string( e.what() );
                 QMessageBox::critical( this, "Error at restrict Endorsement Key", QString::fromStdString( err ) );
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to restrict access to TPM Endorsement Key." );
+        }
 
         initIdentity();
@@ -898 +917 @@
                 string err = "Error while disabling Maintenance Archive. \n" + string( e.what() );
                 QMessageBox::critical( this,  "Error: Disable Maintenance Archive" , QString::fromStdString( err ) );
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to disable TPM Maintenance archive." );
+        }
 }
 

trunk/src/TPMManager.hxx

@@ -27 +27 @@
 #include <QResource>
 #include <QTimer>
-#include "ui_tpmmanagerbase.h"
+#include "ui_TPMManagerBase.h"
 
-#include <microtss/TPM.h>
-#include <microtss/TSS.h>
+#include <microtss/TPM.hxx>
+#include <microtss/TSS.hxx>
 
 /**
-* @file tpmmanager.h
+* @file TPMManager.hxx
 *
 * @brief TPM Manager Controller Class Header File

trunk/src/microtss/PublicKey.cxx

@@ -22 +22 @@
 
 /**
-* @file PublicKey.cpp
+* @file PublicKey.cxx
 *
 * @brief Public Key Class Implementation File
@@ -29 +29 @@
 
 
-#include "PublicKey.h"
+#include "PublicKey.hxx"
 #include <iomanip>
 #include <sstream>

trunk/src/microtss/PublicKey.hxx

@@ -29 +29 @@
 
 /**
-* @file PublicKey.h
+* @file PublicKey.hxx
 *
 * @brief Public Key Class Header File

trunk/src/microtss/TPM.cxx

@@ -22 +22 @@
 
 /**
-* @file TPM.cpp
+* @file TPM.cxx
 *
 * @brief TPM Encapsulation Class Implementation File
@@ -28 +28 @@
 **/
 
-#include "TPM.h"
+#include "TPM.hxx"
 #include <iostream>
 #include <sstream>

trunk/src/microtss/TPM.hxx

@@ -33 +33 @@
 #include <tss/tpm_error.h>
 
-#include <microtss/PublicKey.h>
+#include <microtss/PublicKey.hxx>
 
 #define TSS_ERROR_LAYER(x)      (x & 0x3000)
@@ -39 +39 @@
 
 /**
-* @file TPM.h
+* @file TPM.hxx
 *
 * @brief TPM Encapsulation Class Header File

trunk/src/microtss/TSS.cxx

@@ -22 +22 @@
 
 /**
-* @file TSS.cpp
+* @file TSS.cxx
 *
 * @brief TCG Software Stack Class Implementation File
@@ -28 +28 @@
 **/ 
 
-#include "TSS.h"
+#include "TSS.hxx"
 #include <sys/stat.h>
 #include <iostream>

trunk/src/microtss/TSS.hxx

@@ -33 +33 @@
 
 /**
-* @file TSS.h
+* @file TSS.hxx
 *
 * @brief TCG Software Stack Class Header File

trunk/tpmmanager.pro

@@ -8 +8 @@
 FORMS = ui/NewPasswordDialog.ui \
  ui/PasswordDialog.ui \
- ui/publickeyview.ui \
- ui/setsrkdialog.ui \
- ui/tpmmanagerbase.ui
-HEADERS = src/NewPasswordDialog.h \
- src/PublicKeyView.h \
- src/SetSRKView.h \
- src/microtss/PublicKey.h \
- src/microtss/TPM.h \
- src/microtss/TSS.h \
- src/tpmmanager.h \
- src/PasswordDialog.h
+ ui/PublicKeyView.ui \
+ ui/SetSRKDialog.ui \
+ ui/TPMManagerBase.ui
+HEADERS = src/NewPasswordDialog.hxx \
+ src/PublicKeyView.hxx \
+ src/SetSRKView.hxx \
+ src/microtss/PublicKey.hxx \
+ src/microtss/TPM.hxx \
+ src/microtss/TSS.hxx \
+ src/TPMManager.hxx \
+ src/PasswordDialog.hxx
 INCLUDEPATH += . microtss src
 LIBS += -ltspi
@@ -24 +24 @@
 OBJECTS_DIR = build
 QT = core gui
-SOURCES = src/NewPasswordDialog.cpp \
- src/PublicKeyView.cpp \
- src/SetSRKView.cpp \
- src/main.cpp \
- src/microtss/PublicKey.cpp \
- src/microtss/TPM.cpp \
- src/microtss/TSS.cpp \
- src/tpmmanager.cpp \
- src/PasswordDialog.cpp
+SOURCES = src/NewPasswordDialog.cxx \
+ src/PublicKeyView.cxx \
+ src/SetSRKView.cxx \
+ src/Main.cxx \
+ src/microtss/PublicKey.cxx \
+ src/microtss/TPM.cxx \
+ src/microtss/TSS.cxx \
+ src/TPMManager.cxx \
+ src/PasswordDialog.cxx
 RESOURCES += ui/resources.qrc
 TEMPLATE = app