Changeset 177

Timestamp:

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

Author:

korthaus

Message:

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

Location:

changes/tpmmanager-micro

Files:

• SConscript (modified) (2 diffs)
• src/Main.cxx (moved) (moved from changes/tpmmanager-micro/src/main.cpp) (2 diffs)
• src/NewPasswordDialog.cxx (moved) (moved from changes/tpmmanager-micro/src/NewPasswordDialog.cpp) (2 diffs)
• src/NewPasswordDialog.hxx (moved) (moved from changes/tpmmanager-micro/src/NewPasswordDialog.h) (1 diff)
• src/PasswordDialog.cxx (moved) (moved from changes/tpmmanager-micro/src/PasswordDialog.cpp) (2 diffs)
• src/PasswordDialog.hxx (moved) (moved from changes/tpmmanager-micro/src/PasswordDialog.h) (1 diff)
• src/PublicKeyView.cxx (moved) (moved from changes/tpmmanager-micro/src/PublicKeyView.cpp) (2 diffs)
• src/PublicKeyView.hxx (moved) (moved from changes/tpmmanager-micro/src/PublicKeyView.h) (2 diffs)
• src/SetSRKView.cxx (moved) (moved from changes/tpmmanager-micro/src/SetSRKView.cpp) (2 diffs)
• src/SetSRKView.hxx (moved) (moved from changes/tpmmanager-micro/src/SetSRKView.h) (1 diff)
• src/TPMManager.cxx (moved) (moved from changes/tpmmanager-micro/src/tpmmanager.cpp) (15 diffs)
• src/TPMManager.hxx (moved) (moved from changes/tpmmanager-micro/src/tpmmanager.h) (2 diffs)
• tpmmanager.pro (modified) (1 diff)
• ui/PublicKeyView.ui (moved) (moved from changes/tpmmanager-micro/ui/publickeyview.ui)
• ui/SetSRKDialog.ui (moved) (moved from changes/tpmmanager-micro/ui/setsrkdialog.ui)
• ui/TPMManagerBase.ui (moved) (moved from changes/tpmmanager-micro/ui/tpmmanagerbase.ui)

changes/tpmmanager-micro/SConscript

@@ -27 +27 @@
 
 # optional: set the C++ file suffix; TPM Manager still has .cpp
-local['CXXFILESUFFIX'] = '.cpp'
+local['CXXFILESUFFIX'] = '.cxx'
 local['CXXFLAGS'] = ''
 
@@ -39 +39 @@
 rccs = [ local.Qrc( "ui/resources.qrc", QT4_QRCFLAGS = "-name resources" ) ]
 # add Qt4 user interface files (.ui)
-uis = [ local.Uic4(ui) for ui in [ "ui/tpmmanagerbase.ui", "ui/setsrkdialog.ui", "ui/publickeyview.ui", "ui/PasswordDialog.ui", "ui/NewPasswordDialog.ui" ] ]
+uis = [ local.Uic4(ui) for ui in [ "ui/TPMManagerBase.ui", "ui/SetSRKDialog.ui", "ui/PublicKeyView.ui", "ui/PasswordDialog.ui", "ui/NewPasswordDialog.ui" ] ]
 
 # last but not least, add all of our source files
 # we only need to add our own source files, not the one created from .ui files
-sources = [ "src/main.cpp", "src/tpmmanager.cpp", "src/SetSRKView.cpp", "src/PublicKeyView.cpp", "src/PasswordDialog.cpp", "src/NewPasswordDialog.cpp" ]
+sources = [ "src/Main.cxx", "src/TPMManager.cxx", "src/SetSRKView.cxx", "src/PublicKeyView.cxx", "src/PasswordDialog.cxx", "src/NewPasswordDialog.cxx" ]
 
 # finally, start the build process

changes/tpmmanager-micro/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"
 /// Main application loop
 int main(int argc, char ** argv)

changes/tpmmanager-micro/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) 

changes/tpmmanager-micro/src/NewPasswordDialog.hxx

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

changes/tpmmanager-micro/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>
 

changes/tpmmanager-micro/src/PasswordDialog.hxx

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

changes/tpmmanager-micro/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>

changes/tpmmanager-micro/src/PublicKeyView.hxx

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

changes/tpmmanager-micro/src/SetSRKView.cxx

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

changes/tpmmanager-micro/src/SetSRKView.hxx

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

changes/tpmmanager-micro/src/TPMManager.cxx

@@ -22 +22 @@
 
 /**
-* @file tpmmanager.cpp
+* @file TPMManager.cxx
 *
 * @brief TPM Manager Controller Class Implementation File
@@ -54 +54 @@
 #include <utils/ByteVector.hxx>
 #include <tss/tcs/TestingSecretProvider.hxx>
-#include "PublicKeyView.h"
-#include "PasswordDialog.h"
-#include "NewPasswordDialog.h"
-#include "SetSRKView.h"
-#include "tpmmanager.h"
+#include "PublicKeyView.hxx"
+#include "PasswordDialog.hxx"
+#include "NewPasswordDialog.hxx"
+#include "SetSRKView.hxx"
+#include "TPMManager.hxx"
 
 #define VERSION "0.9.1"
@@ -104 +104 @@
     } catch ( tcs::TPM_Error &e ) {
         QMessageBox::critical( this, "Miscellaneous TPM Error", QString::fromStdString( string("An unknown TPM Error occured: ").append( e.what() ) ) );
+    } catch ( ... ) {
+        QMessageBox::critical( this, "Unknown Error", "An unknown error occured during initialization." );
     }
         
@@ -499 +501 @@
                 std::string msg = "Take Ownership failed (" + string( e.what() ) + ")";
                 QMessageBox::critical( this, "Taking Ownership Failed", QString::fromStdString( msg ) );
-        }
+        } 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) */
@@ -537 +541 @@
                 string err = "Authentication failure 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();
@@ -586 +592 @@
                 string err = "Authentication failure 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();
@@ -619 +627 @@
                 string err = "Authentication failure while clearing TPM: \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: TPM Clear", QString::fromStdString( err ));
-        }       
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to clear TPM Ownership." );
+        }
         // update GUI
         initStatus();
@@ -644 +654 @@
                 std::string msg = "TPM Selftest failed (" + string( e.what() ) + ")";
                 QMessageBox::critical( this, "TPM Selftest", QString::fromStdString( msg ) );
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when performing the TPM selftest." );
+        }
         // refresh TPM status view
         initStatusGroup();
@@ -675 +687 @@
                 string err = "No TPM Operator installed (" + 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." );
+        }
         
         
@@ -812 +826 @@
                         string err = "Authentication failure while disabling TPM: \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 disable TPM." );
+                }
         }
         else
@@ -833 +849 @@
                         string err = "Authentication failure while enabling TPM: \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 enable TPM." );
+                }
         }
         // refresh TPM status view & options
@@ -873 +891 @@
                 string err = "Authentication failed while trying to get Endorsement Key: \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: Show Endorsement Key", QString::fromStdString( err ));
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to retrieve TPM Endorsement Key." );
+        }
 }
 
@@ -905 +925 @@
                 fs.close();
         } catch ( tcs::TPM_FAIL_Error &e ) {
-                string err = "Error when trying to save Endorsement Key. \n" + string( e.what() );
-                QMessageBox::critical( this, "Error: Save Endorsement Key", QString::fromStdString( err ) );
+                string err = "Error when trying to store Endorsement Key. \n" + string( e.what() );
+                QMessageBox::critical( this, "Error: Store Endorsement Key", QString::fromStdString( err ) );
         } catch ( tcs::TPM_AUTHFAIL_Error &e ) {
-                string err = "Authentication failed while trying to save Endorsement Key. \n" + string( e.what() );
-                QMessageBox::critical( this, "Error: Save Endorsement Key", QString::fromStdString( err ) );
+                string err = "Authentication failed while trying to store Endorsement Key. \n" + string( e.what() );
+                QMessageBox::critical( this, "Error: Store Endorsement Key", QString::fromStdString( err ) );
         } catch ( tcs::TPM_DEFEND_LOCK_RUNNING_Error &e ) {
-                string err = "Authentication failed while trying to save Endorsement Key: \n" + string( e.what() );
-                QMessageBox::critical( this, "Error: Save Endorsement Key", QString::fromStdString( err ));
-        }
+                string err = "Authentication failed while trying to store Endorsement Key: \n" + string( e.what() );
+                QMessageBox::critical( this, "Error: Store Endorsement Key", QString::fromStdString( err ));
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to store TPM Endorsement Key." );
+        }
 
 }
@@ -945 +967 @@
                 string err = "Authentication failed while trying to restrict Endorsement Key: \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: 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();
@@ -979 +1003 @@
                 string err = "Authentication failed while trying to disable Maintenance feature: \n" + string( e.what() );
                 QMessageBox::critical( this, "Error: Disable Maintenance", QString::fromStdString( err ));
-        }
+        } catch ( ... ) {
+            QMessageBox::critical( this, "Unknown Error", "An unknown error occured when trying to disable TPM Maintenance archive." );
+        }
 }
 

changes/tpmmanager-micro/src/TPMManager.hxx

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

changes/tpmmanager-micro/tpmmanager.pro

@@ -8 +8 @@
 FORMS = ui/NewPasswordDialog.ui \
  ui/PasswordDialog.ui \
- ui/publickeyview.ui \
- ui/setsrkdialog.ui \
- ui/tpmmanagerbase.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
-INCLUDEPATH += . microtss src
+ src/PublicKeyView.hxx \
+ src/SetSRKView.hxx \
+ src/TPMManager.hxx \
+ src/PasswordDialog.hxx \
+ src/NewPasswordDialog.hxx
+INCLUDEPATH += . src
 LIBS += -ltspi
 MOC_DIR = build
 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/TPMManager.cxx \
+ src/PasswordDialog.cxx
 RESOURCES += ui/resources.qrc
 TEMPLATE = app