From 53c84c5dffa6417e5fe95bb51bb03f0836102826 Mon Sep 17 00:00:00 2001
From: chris <chris>
Date: Mon, 23 Sep 2002 00:17:36 +0000
Subject: [PATCH] *** empty log message ***

---
 MainWindow.cpp        | 5 ++++-
 MainWindow.h          | 2 +-
 MainWindowX509Req.cpp | 2 +-
 NewX509.cpp           | 1 +
 NewX509_UI.ui         | 6 +++++-
 lib/db_base.cpp       | 3 +--
 lib/pki_temp.cpp      | 6 ++++++
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 10d59909..9e69094e 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -54,7 +54,8 @@
 
 QPixmap *MainWindow::keyImg = NULL, *MainWindow::csrImg = NULL,
 	*MainWindow::certImg = NULL, *MainWindow::tempImg = NULL,
-	*MainWindow::nsImg = NULL;
+	*MainWindow::nsImg = NULL, *MainWindow::revImg = NULL;
+
 
 const QString MainWindow::xca_title = tr("X Certifikate and Key management");
 
@@ -93,6 +94,7 @@ MainWindow::MainWindow(QWidget *parent, const char *name )
 	certImg = loadImg("bigcert.png");
 	tempImg = loadImg("bigtemp.png");
 	nsImg = loadImg("netscape.png");
+	revImg = loadImg("revoked.png");
 	initPass();
 	keys = new db_key(dbenv, dbfile.latin1(), keyList);
 	reqs = new db_x509req(dbenv, dbfile.latin1(), reqList, keys);
@@ -102,6 +104,7 @@ MainWindow::MainWindow(QWidget *parent, const char *name )
 	bigCsr->setPixmap(*csrImg);
 	bigCert->setPixmap(*certImg);
 	bigTemp->setPixmap(*tempImg);
+	bigRev->setPixmap(*revImg);
 #ifdef qt3	
 	connect( keyList, SIGNAL(itemRenamed(QListViewItem *, int, const QString &)),this, SLOT(renameKey(QListViewItem *, int, const QString &)));
 	connect( reqList, SIGNAL(itemRenamed(QListViewItem *, int, const QString &)),this, SLOT(renameReq(QListViewItem *, int, const QString &)));
diff --git a/MainWindow.h b/MainWindow.h
index 32ec9cd7..e9cf1c3d 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -116,7 +116,7 @@ class MainWindow: public MainWindow_UI
 	db_temp *temps;
 	DbEnv *dbenv;
 	db_base *settings;
-	static QPixmap *keyImg, *csrImg, *certImg, *tempImg, *nsImg;
+	static QPixmap *keyImg, *csrImg, *certImg, *tempImg, *nsImg, *revImg;
 	const static QString xca_title;
    public:
 	QString baseDir, dbfile;
diff --git a/MainWindowX509Req.cpp b/MainWindowX509Req.cpp
index 8a7721a9..05e8df4a 100644
--- a/MainWindowX509Req.cpp
+++ b/MainWindowX509Req.cpp
@@ -93,7 +93,7 @@ void MainWindow::showDetailsReq(pki_x509req *req)
 	if (opensslError(req)) return;
 	ReqDetail_UI *dlg = new ReqDetail_UI(this,0,true);
 	dlg->descr->setText(req->getDescription().c_str());
-	if ( req->verify() ) {
+	if (!req->verify() ) {
 	      	dlg->verify->setDisabled(true);
 		dlg->verify->setText("FEHLER");
 	}
diff --git a/NewX509.cpp b/NewX509.cpp
index 1900b717..0af92837 100644
--- a/NewX509.cpp
+++ b/NewX509.cpp
@@ -140,6 +140,7 @@ NewX509::NewX509(QWidget *parent , const char *name, db_key *key, db_x509req *re
 			setAppropriate(page1,false);
 		}
 		else {
+			strings.prepend(tr("Empty Template"));
 			tempList->insertStringList(strings);
 		}
 	}
diff --git a/NewX509_UI.ui b/NewX509_UI.ui
index 34b566e3..32ada3e6 100644
--- a/NewX509_UI.ui
+++ b/NewX509_UI.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>596</width>
+            <width>592</width>
             <height>520</height>
         </rect>
     </property>
@@ -1574,6 +1574,10 @@ For a SSL servercertificate choose the DNS name of the server as "Common name"</
                                 <vsizetype>7</vsizetype>
                             </sizepolicy>
                         </property>
+                        <property stdset="1">
+                            <name>selectionMode</name>
+                            <enum>Multi</enum>
+                        </property>
                     </widget>
                     <spacer>
                         <property>
diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index cdf1220d..df5f43b1 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -420,8 +420,7 @@ QPixmap *db_base::loadImg(const char *name )
 		path +=	QDir::separator();
 		path += BASE_DIR ;
 #else
-		path = QDir::homeDirPath() + QDir::separator();
-		path += PREFIX ;
+		path = PREFIX ;
 #endif
 		path += QDir::separator();
 		path += name;
diff --git a/lib/pki_temp.cpp b/lib/pki_temp.cpp
index 24a35105..26c204c4 100644
--- a/lib/pki_temp.cpp
+++ b/lib/pki_temp.cpp
@@ -131,6 +131,8 @@ pki_temp::pki_temp(const string d, int atype)
 		bcCrit=true;
 		authKey=true;
 		issAltCp=true;
+		nsCertType=112;
+		keyUse=96;
 	}
 	if (type==tCLIENT) {
 		ca=false;
@@ -138,6 +140,8 @@ pki_temp::pki_temp(const string d, int atype)
 		authKey=true;
 		issAltCp=true;
 		subAltCp=true;
+		nsCertType=5;
+		keyUse=13;
 	}
 	if (type==tSERVER) {
 		ca=false;
@@ -145,6 +149,8 @@ pki_temp::pki_temp(const string d, int atype)
 		authKey=true;
 		issAltCp=true;
 		subAltCp=true;
+		nsCertType=2;
+		keyUse=12;
 	}
 
 }