diff --git a/CertView.cpp b/CertView.cpp
new file mode 100644
index 00000000..ec25641d
--- /dev/null
+++ b/CertView.cpp
@@ -0,0 +1,1316 @@
+/*
+ * Copyright (C) 2001 Christian Hohnstaedt.
+ *
+ *  All rights reserved.
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *  - Neither the name of the author nor the names of its contributors may be 
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * This program links to software with different licenses from:
+ *
+ *	http://www.openssl.org which includes cryptographic software
+ * 	written by Eric Young (eay@cryptsoft.com)"
+ *
+ *	http://www.sleepycat.com
+ *
+ *	http://www.trolltech.com
+ * 
+ *
+ *
+ * http://www.hohnstaedt.de/xca
+ * email: christian@hohnstaedt.de
+ *
+ * $Id$ 
+ *
+ */                           
+
+
+#include "CertView.h"
+
+CertView::CertView(QWidget * parent = 0, const char * name = 0, WFlags f = 0)
+        :XcaListView(parent, name, f)
+{
+        certicon[0] = loadImg("validcert.png");
+        certicon[1] = loadImg("validcertkey.png");
+        certicon[2] = loadImg("invalidcert.png");
+        certicon[3] = loadImg("invalidcertkey.png");
+        listView->addColumn(tr("Common Name"));
+        listView->addColumn(tr("Serial"));
+        listView->addColumn(tr("not After"));
+        listView->addColumn(tr("Trust state"));
+        listView->addColumn(tr("Revokation"));
+        loadContainer();
+        viewState=1; // Tree View
+        updateView();
+}	
+
+
+void CertView::newCert()
+{
+	NewX509 *dlg = MainWindow::newX509(MainWindow::certImg);
+	dlg->setCert();
+	if (dlg->exec()) {
+		newCert(dlg);
+	}
+	delete dlg;
+}
+
+void CertView::newCert(pki_temp *templ)
+{
+	NewX509 *dlg = MainWindow::newX509(MainWindow::certImg);
+	if (templ) {
+		dlg->defineTemplate(templ);
+	}
+	dlg->setCert();
+	if (dlg->exec()) {
+		newCert(dlg);
+	}
+	delete dlg;
+}
+
+void CertView::newCert(pki_x509req *req)
+{
+	NewX509 *dlg = MainWindow::newX509(MainWindow::certImg);
+	if (req) {
+		dlg->defineRequest(req);
+	}
+	dlg->setCert();
+	if (dlg->exec()) {
+		newCert(dlg);
+	}
+	delete dlg;
+}
+
+void CertView::newCert(NewX509 *dlg)
+{
+	pki_x509 *cert = NULL;
+	pki_x509 *signcert = NULL;
+	pki_x509req *req = NULL;
+	pki_key *signkey = NULL, *clientkey = NULL;
+	int serial = 42; // :-)
+	bool tempReq=false;
+	int i, x, days;
+	string cont="", subAltName="", issAltName="", constraints="",
+		keyuse="", keyuse1="", pathstr="", certTypeStr = "";
+	char *ekeyusage[]= {"serverAuth","clientAuth","codeSigning","emailProtection",
+		"timeStamping","msCodeInd","msCodeCom",
+		"msCTLSign","msSGC","msEFS","nsSGC","1.3.6.1.4.1.311.10.3.4.1"};
+	char *keyusage[] ={"digitalSignature", "nonRepudiation", "keyEncipherment",
+		"dataEncipherment", "keyAgreement", "keyCertSign",
+		"cRLSign", "encipherOnly", "decipherOnly"};
+	char *certTypeList[] = { "client", "server", "email", "objsign",
+				 "sslCA", "emailCA", "objCA" };
+	QListBoxItem *item;
+	
+
+    try {	
+	// Step 1 - Subject and key
+	if (!dlg->fromReqCB->isChecked()) {
+	    clientkey = dlg->getSelectedKey();
+	    x509name xn = dlg->getX509name();
+	    req = new pki_x509req();
+	    req->createReq(clientkey, xn);
+	    tempReq = true;
+	}
+	else {
+	    // A PKCS#10 Request was selected 
+	    req = (pki_x509req *)reqs->getSelectedPKI(dlg->reqList->currentText().latin1());
+	    if (opensslError(req)) return;
+	    clientkey = req->getKey();
+	}
+		
+	// Step 2 - select Signing
+	if (dlg->foreignSignRB->isChecked()) {
+		signcert = (pki_x509 *)certs->getSelectedPKI(dlg->certList->currentText().latin1());
+		signkey = signcert->getKey();
+		// search for serial in database
+		
+	}
+	else {
+		signkey = clientkey;	
+		bool ok;
+		serial = dlg->serialNr->text().toInt(&ok);
+		if (!ok) serial = 0;
+	}
+	
+	
+	// Step 3 - Choose the Date and all the V3 extensions
+	// Date handling
+	x = dlg->validNumber->text().toInt();
+	days = dlg->validRange->currentItem();
+	if (days == 1) x *= 30;
+	if (days == 2) x *= 365;
+	
+	// increase serial here	
+	if (dlg->foreignSignRB->isChecked()) {
+		serial = signcert->getIncCaSerial();
+		// get own serial to avoid having the same
+		int sigser;
+		sscanf(signcert->getSerial().c_str(), "%x", &sigser);
+		if (serial == sigser) { // FIXME: anybody tell me the string method for this ?
+			serial = signcert->getIncCaSerial(); // just take the next one
+		}
+		certs->updatePKI(signcert);  // not so pretty ....
+		CERR("serial is: " << serial );
+	}	
+	
+	// initially create cert 
+	cert = new pki_x509(req->getDescription(), clientkey, req, signcert, x, serial);
+	if (!signcert) signcert=cert;	
+	if (cert->resetTimes(signcert) > 0) {
+		if (QMessageBox::information(this,tr(XCA_TITLE),
+			tr("The validity times for the certificate need to get adjusted to not exceed those of the signer"),
+			tr("Continue creation"), tr("Abort")
+		))
+			throw errorEx("");
+	}
+			
+	// handle extensions
+	// basic constraints
+	if (dlg->bcCritical->isChecked()) constraints = "critical,";
+	constraints +="CA:";
+	constraints += dlg->basicCA->currentText().latin1();
+	pathstr = dlg->basicPath->text().latin1();
+	if (pathstr.length()>0) {
+		constraints += ", pathlen:";
+		constraints += pathstr;
+	}
+	cert->addV3ext(NID_basic_constraints, constraints);
+	// Subject Key identifier
+	if (dlg->subKey->isChecked()) {
+		string subkey="hash";
+		cert->addV3ext(NID_subject_key_identifier, subkey);
+		CERR( subkey );
+	}
+	// Authority Key identifier
+	if (dlg->authKey->isChecked()) {
+		string authkey="keyid:always,issuer:always";
+		cert->addV3ext(NID_authority_key_identifier, authkey);
+		CERR( authkey );
+	}
+	 
+	// key usage
+	for (i=0; (item = dlg->keyUsage->item(i)); i++) {	
+		if (item->selected()){
+			addStr(keyuse, keyusage[i]);
+		}
+	}
+	
+	if (keyuse.length() > 0) {
+		keyuse1 = keyuse;
+		if (dlg->kuCritical->isChecked()) keyuse1 = "critical, " +keyuse;
+		cert->addV3ext(NID_key_usage, keyuse1);
+		CERR( "KeyUsage:" <<keyuse1);
+	}
+	
+	// extended key usage
+	keyuse=""; keyuse1="";
+	for (i=0; (item = dlg->ekeyUsage->item(i)); i++) {	
+		if (item->selected()){
+			addStr(keyuse, ekeyusage[i]);
+		}
+	}
+	
+	if (keyuse.length() > 0) {
+		keyuse1 = keyuse;
+		if (dlg->ekuCritical->isChecked()) keyuse1 = "critical, " +keyuse;
+		cert->addV3ext(NID_ext_key_usage, keyuse1);
+		CERR( "Extended Key Usage:" <<keyuse1 );
+	}
+	
+	
+	// STEP 4
+	// Subject Alternative name
+	cont = "";
+	cont = dlg->subAltName->text().latin1();
+	if (dlg->subAltCp->isChecked()) {
+		if (req->getDN(NID_pkcs9_emailAddress).length() == 0) {
+			if (QMessageBox::information(this,tr(XCA_TITLE),
+			   tr("You requested to copy the subject E-Mail address but it is empty !"),
+			   tr("Continue creation"), tr("Abort")
+			))
+				throw errorEx("");	
+		}
+		else {
+			subAltName = "email:copy";
+		}
+	}
+	if (cont.length() > 0){
+		addStr(subAltName,cont.c_str());
+	}
+	if (subAltName.length() > 0) {
+		CERR( "SubAltName:" << subAltName);
+		cert->addV3ext(NID_subject_alt_name, subAltName);
+	}
+	
+	cont = "";
+	cont = dlg->issAltName->text().latin1();
+	// issuer alternative name	
+	if (dlg->issAltCp->isChecked()) {
+		if (!signcert->hasSubAltName()) {
+			if (QMessageBox::information(this,tr(XCA_TITLE),
+			   tr("You requested to copy the issuer alternative name but it is empty !"),
+			   tr("Continue creation"), tr("Abort")
+			))
+				throw errorEx("");	
+		}
+		else {
+			issAltName = "issuer:copy";
+		}
+	}
+	if (cont.length() > 0){
+		addStr(issAltName,cont.c_str());
+	}
+	if (issAltName.length() > 0) {
+		CERR("IssAltName:" << issAltName);
+		cert->addV3ext(NID_issuer_alt_name, issAltName);
+	}
+	// CRL distribution points
+	if (!dlg->crlDist->text().isEmpty()) {
+		CERR("CRL dist. Point: "<<  dlg->crlDist->text().latin1() );
+		cert->addV3ext(NID_crl_distribution_points, dlg->crlDist->text().latin1());
+	}
+		
+	// Step 5
+	// Nestcape extensions 
+	for (i=0; (item = dlg->nsCertType->item(i)); i++) {	
+		if (item->selected()){
+			addStr(certTypeStr, certTypeList[i]);
+		}
+	}
+	cert->addV3ext(NID_netscape_cert_type, certTypeStr);
+	cert->addV3ext(NID_netscape_base_url, dlg->nsBaseUrl->text().latin1());
+	cert->addV3ext(NID_netscape_revocation_url, dlg->nsRevocationUrl->text().latin1());
+	cert->addV3ext(NID_netscape_ca_revocation_url, dlg->nsCARevocationUrl->text().latin1());
+	cert->addV3ext(NID_netscape_renewal_url, dlg->nsRenewalUrl->text().latin1());
+	cert->addV3ext(NID_netscape_ca_policy_url, dlg->nsCaPolicyUrl->text().latin1());
+	cert->addV3ext(NID_netscape_ssl_server_name, dlg->nsSslServerName->text().latin1());
+	cert->addV3ext(NID_netscape_comment, dlg->nsComment->text().latin1());
+	
+	// and finally sign the request 
+	cert->sign(signkey);
+	CERR( "SIGNED");
+	insert(cert);
+	CERR("inserted");
+	if (tempReq && req) delete(req);
+	CERR("Dialog deleted" );
+	updateView();
+	return;
+    }
+    catch (errorEx &err) {
+	Error(err);
+	delete cert;
+	if (tempReq && req) delete(req);
+    }
+	
+}
+void CertView::addStr(string &str, const  char *add)
+{
+	string sadd = add;
+	if (sadd.length() == 0) return;	
+	if (str.length() > 0 ) {
+		str += ", ";
+	}
+	str += add;
+}
+
+void CertView::extendCert()
+{
+	pki_x509 *oldcert = NULL, *signer = NULL, *newcert =NULL;
+	pki_key *signkey = NULL;
+	int serial, days, x;
+	try {
+		CertExtend_UI *dlg = new CertExtend_UI(this, NULL, true);
+		dlg->image->setPixmap(*certImg);
+		if (!dlg->exec()) {
+			delete dlg;
+			return;
+		}
+		oldcert = (pki_x509 *)certs->getSelectedPKI();
+		if (!oldcert || !(signer = oldcert->getSigner()) || !(signkey = signer->getKey()) || signkey->isPubKey()) return;
+		newcert = new pki_x509(oldcert);
+		serial = signer->getIncCaSerial();
+		
+		// get signers own serial to avoid having the same
+		if (serial == atoi(signer->getSerial().c_str())) { // FIXME: anybody tell me the string method for this ?
+			serial = signer->getIncCaSerial(); // just take the next one
+		}
+		certs->updatePKI(signer);  // not so pretty ....
+		CERR("serial is: " << serial );
+		
+		// Date handling
+		x = dlg->validNumber->text().toInt();
+		days = dlg->validRange->currentItem();
+		if (days == 1) x *= 30;
+		if (days == 2) x *= 365;
+		
+		// change date and serial
+		newcert->setSerial(serial);
+		newcert->setDates(x); // now and now + x days
+
+		if (newcert->resetTimes(signer) > 0) {
+			if (QMessageBox::information(this,tr(XCA_TITLE),
+				tr("The validity times for the certificate need to get adjusted to not exceed those of the signer"),
+				tr("Continue creation"), tr("Abort")
+			))
+				throw errorEx("");
+		}
+		
+		
+		// and finally sign the request 
+		newcert->sign(signkey);
+		CERR( "SIGNED");
+		insertCert(newcert);
+		CERR("inserted");
+		delete dlg;
+	}
+	catch (errorEx &err) {
+		Error(err);
+		if (newcert)
+			delete newcert;
+	}
+}
+		
+bool CertView::show(pki_base *basecert, bool import)
+{
+	pki_x509 *cert = (pki_x509 *)basecert;
+	if (!cert) return false;
+	if (opensslError(cert)) return false;
+    try {
+	CertDetail_UI *dlg = new CertDetail_UI(this,0,true);
+	bool ret;
+	dlg->image->setPixmap(*certImg);
+	dlg->descr->setText(cert->getDescription().c_str());
+	dlg->setCaption(tr(XCA_TITLE));
+
+	// examine the key
+	pki_key *key= cert->getKey();
+	if (key)
+	     if (key->isPrivKey()) {
+		dlg->privKey->setText(key->getDescription().c_str());
+	      	dlg->privKey->setDisabled(false);
+	     }								
+
+	// examine the signature
+	if ( cert->getSigner() == NULL) {
+		dlg->verify->setText(tr("SIGNER UNKNOWN"));
+	}
+	else if ( cert->compare(cert->getSigner()) ) {
+		dlg->verify->setText(tr("SELF SIGNED"));
+	}
+	
+	else {
+		dlg->verify->setText(cert->getSigner()->getDescription().c_str());
+	}
+
+	// check trust state
+	if (cert->getEffTrust() == 0) {
+	      	dlg->verify->setDisabled(true);
+	}
+	CERR( cert->getEffTrust() );
+	
+	// the serial
+	dlg->serialNr->setText(cert->getSerial().c_str());	
+
+	// details of subject
+	string land = cert->getDNs(NID_countryName);
+	string land1 = cert->getDNs(NID_stateOrProvinceName);
+	if (land != "" && land1 != "")
+		land += " / " +land1;
+	else
+		land+=land1;
+	
+	
+	dlg->dnCN->setText(cert->getDNs(NID_commonName).c_str() );
+	dlg->dnC->setText(land.c_str());
+	dlg->dnL->setText(cert->getDNs(NID_localityName).c_str());
+	dlg->dnO->setText(cert->getDNs(NID_organizationName).c_str());
+	dlg->dnOU->setText(cert->getDNs(NID_organizationalUnitName).c_str());
+	dlg->dnEmail->setText(cert->getDNs(NID_pkcs9_emailAddress).c_str());
+	
+	MARK
+	// same for issuer....	
+	land = cert->getDNi(NID_countryName);
+	land1 = cert->getDNi(NID_stateOrProvinceName);
+	if (land != "" && land1 != "")
+		land += " / " +land1;
+	else
+		land+=land1;
+	dlg->dnCN_2->setText(cert->getDNi(NID_commonName).c_str() );
+	dlg->dnC_2->setText(land.c_str());
+	dlg->dnL_2->setText(cert->getDNi(NID_localityName).c_str());
+	dlg->dnO_2->setText(cert->getDNi(NID_organizationName).c_str());
+	dlg->dnOU_2->setText(cert->getDNi(NID_organizationalUnitName).c_str());
+	dlg->dnEmail_2->setText(cert->getDNi(NID_pkcs9_emailAddress).c_str());
+	dlg->notBefore->setText(cert->notBefore().c_str());
+	dlg->notAfter->setText(cert->notAfter().c_str());
+	MARK
+	
+	// validation of the Date
+	if (cert->checkDate() == -1) {
+		dlg->dateValid->setText(tr("Not valid"));
+	      	dlg->dateValid->setDisabled(true);
+	}
+	if (cert->checkDate() == +1) {
+		dlg->dateValid->setText(tr("Not valid"));
+	      	dlg->dateValid->setDisabled(true);
+	}
+	string revdate = cert->revokedAt();
+	if (revdate != "") {
+		dlg->dateValid->setText(tr("Revoked: ")+ revdate.c_str());
+	      	dlg->dateValid->setDisabled(true);
+		
+	}
+	// the fingerprints
+	dlg->fpMD5->setText(cert->fingerprint(EVP_md5()).c_str());
+	dlg->fpSHA1->setText(cert->fingerprint(EVP_sha1()).c_str());
+	
+	// V3 extensions
+	dlg->v3Extensions->setText(cert->printV3ext().c_str());
+	
+	// rename the buttons in case of import 
+	if (import) {
+		dlg->but_ok->setText(tr("Import"));
+		dlg->but_cancel->setText(tr("Discard"));
+	}
+
+	// show it to the user...	
+	string odesc = cert->getDescription();
+	ret = dlg->exec();
+	string ndesc = dlg->descr->text().latin1();
+	delete dlg;
+	if (!ret && import) {
+		delete cert;
+	}
+	if (!ret) return false;	
+	
+	if (!certs) {
+		init_database();
+	}
+	if (import) {
+		cert = insertCert(cert);
+	}
+	if (ndesc != odesc) {
+		certs->renamePKI(cert, ndesc);
+		return true;
+	}
+    }
+    catch (errorEx &err) {
+	    Error(err);
+    }
+    return false;
+}
+
+void CertView::deleteCert()
+{
+    try {
+	pki_x509 *cert = (pki_x509 *)getSelected();
+	if (!cert) return;
+	if (cert->getSigner() && cert->getSigner() != cert && cert->getSigner()->canSign()) {
+		QMessageBox::information(this,tr(XCA_TITLE),
+			tr("It is actually not a good idea to delete a cert that was signed by you") +":\n'" + 
+			QString::fromLatin1(cert->getIntName()) + "'\n" ,
+			tr("Ok") );
+	}
+    	deleteItem_default(tr("The certificate"), tr("is going to be deleted"));
+    }
+    catch (errorEx &err) {
+	    Error(err);
+    }
+}
+
+void CertView::loadCert()
+{
+	QStringList filter;
+	filter.append(tr("Certificates ( *.pem *.der *.crt *.cer )")); 
+	filter.append(tr("All files ( *.* )"));
+	load_default(filter,tr("Certificate import"));
+}
+
+void CertView::loadItem(QString fname)
+{
+	pki_x509 *cert = new pki_x509(s.latin1());
+	return cert;
+}
+
+void CertView::loadPKCS12()
+{
+	pki_pkcs12 *pk12;
+	QStringList filt;
+	filt.append(tr("PKCS#12 Certificates ( *.p12 *.pfx )")); 
+	filt.append(tr("All files ( *.* )"));
+	QStringList slist;
+	QString s="";
+	QFileDialog *dlg = new QFileDialog(this,0,true);
+	dlg->setCaption(tr("Certificate import"));
+	dlg->setFilters(filt);
+	dlg->setMode( QFileDialog::ExistingFiles );
+	setPath(dlg);
+	if (dlg->exec()) {
+		slist = dlg->selectedFiles();
+		newPath(dlg);
+	}
+	delete dlg;
+	for ( QStringList::Iterator it = slist.begin(); it != slist.end(); ++it ) {
+		s = *it;
+		s = QDir::convertSeparators(s);
+		try {
+			pk12 = new pki_pkcs12(s.latin1(), &CertView::passRead);
+			insertP12(pk12);
+			MARK
+		}
+		catch (errorEx &err) {
+			Error(err);
+		}
+		MARK
+		delete pk12;
+		MARK
+	}
+}
+
+			
+void CertView::insertP12(pki_pkcs12 *pk12)
+{
+	pki_x509 *acert;
+	pki_key *akey;
+
+	try {
+		MARK
+		akey = pk12->getKey();
+		MARK
+		acert = pk12->getCert();
+#ifdef INSERT_WO_ASK
+		insertKey(akey);
+		insertCert(acert);
+		for (int i=0; i<pk12->numCa(); i++) {
+			acert = pk12->getCa(i);
+			insertCert(acert);
+		}
+#else
+		MARK
+		keyList->show(akey, true);
+		MARK
+		showDetailsCert(acert,true);
+		MARK
+		for (int i=0; i<pk12->numCa(); i++) {
+			acert = pk12->getCa(i);
+			showDetailsCert(acert, true);
+		MARK
+		}
+#endif			
+		MARK
+		if (keys)
+			keys->updateView();
+	}
+	catch (errorEx &err) {
+		Error(err);
+	}
+	MARK
+}	
+	
+
+void CertView::loadPKCS7()
+{
+	pki_pkcs7 *pk7 = NULL;
+	pki_x509 *acert;
+	QStringList filt;
+	filt.append(tr("PKCS#7 data ( *.p7s *.p7m *.p7b )")); 
+	filt.append(tr("All files ( *.* )"));
+	QStringList slist;
+	QString s="";
+	QFileDialog *dlg = new QFileDialog(this,0,true);
+	dlg->setCaption(tr("Certificate import"));
+	dlg->setFilters(filt);
+	dlg->setMode( QFileDialog::ExistingFiles );
+	setPath(dlg);
+	if (dlg->exec()) {
+		slist = dlg->selectedFiles();
+		newPath(dlg);
+	}
+	delete dlg;
+	for ( QStringList::Iterator it = slist.begin(); it != slist.end(); ++it ) {
+		s = *it;
+		s = QDir::convertSeparators(s);
+		try {
+			pk7 = new pki_pkcs7(s.latin1());
+			MARK
+			pk7->readP7(s.latin1());
+			MARK
+			for (int i=0; i<pk7->numCert(); i++) {
+				acert = pk7->getCert(i);
+				showDetailsCert(acert, true);
+			}
+			keys->updateView();
+		}
+		catch (errorEx &err) {
+			Error(err);
+		}
+		MARK
+		if (pk7) delete pk7;
+		MARK
+	}
+}
+
+
+pki_x509 *CertView::insert(pki_base *item)
+{
+    pki_x509 *cert = (pki_x509 *)item;
+    try {
+	pki_x509 *oldcert = (pki_x509 *)certs->findPKI(cert);
+	if (oldcert) {
+	   QMessageBox::information(this,tr(XCA_TITLE),
+		tr("The certificate already exists in the database as") +":\n'" +
+		QString::fromLatin1(oldcert->getDescription().c_str()) + 
+		"'\n" + tr("and so it was not imported"), "OK");
+	   delete(cert);
+	   return oldcert;
+	}
+	CERR( "insertCert: inserting" );
+	certs->insertPKI(cert);
+    }
+    catch (errorEx &err) {
+	    Error(err);
+    }
+    int serial;
+    if (cert->getSigner() != cert && cert->getSigner()) {
+	sscanf(cert->getSerial().c_str(), "%x", &serial);
+	CERR("OTHER SIGNER" << serial);
+    	if (serial >= cert->getSigner()->getCaSerial()) {
+	    QMessageBox::information(this,tr(XCA_TITLE),
+		tr("The certificate-serial is higher than the next serial of the signer it will be set to ") +
+		QString::number(serial + 1), "OK");
+	    cert->getSigner()->setCaSerial(serial+1);
+	}	
+    }
+    serial = certs->searchSerial(cert);
+    if ( serial > 0) {
+	QMessageBox::information(this,tr(XCA_TITLE),
+		tr("The certificate CA serial is lower than the highest serial of one signed certificate it will be set to ") +
+		QString::number(serial ), "OK");
+	cert->setCaSerial(serial);
+    }
+    certs->updatePKI(cert);
+    cert->tinyCAfname();
+    return cert;
+}
+
+#define P7_ONLY 0
+#define P7_CHAIN 1
+#define P7_TRUSTED 2
+
+void CertView::writeCert()
+{
+	QStringList filt;
+	pki_x509 *crt = (pki_x509 *)certs->getSelectedPKI();
+	pki_x509 *oldcrt = NULL;
+	if (!crt) return;
+	pki_key *privkey = crt->getKey();
+	ExportCert *dlg = new ExportCert((crt->getDescription() + ".crt").c_str(),
+			  (privkey && privkey->isPrivKey()), getPath(), crt->tinyCAfname().c_str() );
+	dlg->image->setPixmap(*certImg);
+	int dlgret = dlg->exec();
+	newPath(dlg->dirPath);
+
+	if (!dlgret) {
+		delete dlg;
+		return;
+	}
+	QString fname = dlg->filename->text();
+        if (fname == "") {
+                delete dlg;
+                return;
+        }
+	try {
+	    switch (dlg->exportFormat->currentItem()) {
+		case 0: // PEM
+			crt->writeCert(fname.latin1(),true,false);
+			break;
+		case 1: // PEM with chain
+			while(crt && crt != oldcrt) {
+				crt->writeCert(fname.latin1(),true,true);
+				oldcrt = crt;
+				crt = crt->getSigner();
+			}
+			break;
+		case 2: // PEM all trusted Certificates
+			certs->writeAllCerts(fname,true);
+			break;
+		case 3: // PEM all Certificates
+			certs->writeAllCerts(fname,false);
+			break;
+		case 4: // DER	
+			crt->writeCert(fname.latin1(),false,false);
+			break;
+		case 5: // P7 lonely
+			writePKCS7(fname, P7_ONLY);
+			break;
+		case 6: // P12
+			writePKCS7(fname, P7_CHAIN);
+			break;
+		case 7: // P12
+			writePKCS7(fname, P7_TRUSTED);
+			break;
+		case 8: // P12
+			writePKCS12(fname,false);
+			break;
+		case 9: // P12 + cert chain
+			writePKCS12(fname,true);
+			break;
+
+	    }
+	}
+	catch (errorEx &err) {
+		Error(err);
+	}
+	delete dlg;
+}
+
+
+void CertView::writePKCS12(QString s, bool chain)
+{
+	QStringList filt;
+    try {
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	pki_key *privkey = cert->getKey();
+	if (!privkey || privkey->isPubKey()) {
+		QMessageBox::warning(this,tr(XCA_TITLE),
+                	tr("There was no key found for the Certificate: ") +
+			QString::fromLatin1(cert->getDescription().c_str()) );
+		return; 
+	}
+	if (s.isEmpty()) return;
+	s = QDir::convertSeparators(s);
+	pki_pkcs12 *p12 = new pki_pkcs12(cert->getDescription(), cert, privkey, &CertView::passWrite);
+	pki_x509 *signer = cert->getSigner();
+	int cnt =0;
+	while ((signer != NULL ) && (signer != cert) && chain) {
+		CERR("SIGNER:"<<(int)signer);
+		p12->addCaCert(signer);
+		CERR( "signer: " << ++cnt );
+		cert=signer;
+		signer=signer->getSigner();
+	}
+	CERR("start writing" );
+	p12->writePKCS12(s.latin1());
+	delete p12;
+    }
+    catch (errorEx &err) {
+	    Error(err);
+    }
+}
+
+void CertView::writePKCS7(QString s, int type) {
+    pki_pkcs7 *p7 = NULL;
+    QList<pki_x509> list;
+    pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+    try {	
+	p7 =  new pki_pkcs7("");
+	if ( type == P7_CHAIN ) {
+		while (cert != NULL) {
+			p7->addCert(cert);
+			if (cert->getSigner() == cert) cert = NULL;
+			else cert = cert->getSigner();
+		}
+	}
+	if ( type == P7_ONLY ) {
+		p7->addCert(cert);
+	}	
+	if (type == P7_TRUSTED) {
+		list = certs->getCerts(true);
+		if (!list.isEmpty()) {
+       			for ( cert = list.first(); cert != NULL; cert = list.next() ) {
+				p7->addCert(cert);
+			}
+		}
+	}
+	p7->writeP7(s.latin1(), false);
+    }
+    catch (errorEx &err) {
+	    Error(err);
+    }
+    if (p7 != NULL ) delete p7;
+	
+}
+		
+void CertView::signP7()
+{
+	QStringList filt;
+    try {
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	pki_key *privkey = cert->getKey();
+	if (!privkey || privkey->isPubKey()) {
+		QMessageBox::warning(this,tr(XCA_TITLE),
+                	tr("There was no key found for the Certificate: ") +
+			QString::fromLatin1(cert->getDescription().c_str()) );
+		return; 
+	}
+        filt.append("All Files ( *.* )");
+	QString s="";
+	QStringList slist;
+	QFileDialog *dlg = new QFileDialog(this,0,true);
+	dlg->setCaption(tr("Import Certificate signing request"));
+	dlg->setFilters(filt);
+	dlg->setMode( QFileDialog::ExistingFiles );
+	setPath(dlg);
+	if (dlg->exec()) {
+		slist = dlg->selectedFiles();
+		newPath(dlg);
+        }
+	delete dlg;
+	pki_pkcs7 * p7 = new pki_pkcs7("");
+	for ( QStringList::Iterator it = slist.begin(); it != slist.end(); ++it ) {
+		s = *it;
+		s = QDir::convertSeparators(s);
+		p7->signFile(cert, s.latin1());
+		p7->writeP7((s + ".p7s").latin1(), true);
+	}
+	delete p7;
+    }
+    catch (errorEx &err) {
+	Error(err);
+    }
+}	
+
+void CertView::encryptP7()
+{
+	QStringList filt;
+    try {
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	pki_key *privkey = cert->getKey();
+	if (!privkey || privkey->isPubKey()) {
+		QMessageBox::warning(this,tr(XCA_TITLE),
+                	tr("There was no key found for the Certificate: ") +
+			QString::fromLatin1(cert->getDescription().c_str()) );
+		return; 
+	}
+        filt.append("All Files ( *.* )");
+	QString s="";
+	QStringList slist;
+	QFileDialog *dlg = new QFileDialog(this,0,true);
+	dlg->setCaption(tr("Import Certificate signing request"));
+	dlg->setFilters(filt);
+	dlg->setMode( QFileDialog::ExistingFiles );
+	setPath(dlg);
+	if (dlg->exec()) {
+		slist = dlg->selectedFiles();
+		newPath(dlg);
+        }
+	delete dlg;
+	pki_pkcs7 * p7 = new pki_pkcs7("");
+	for ( QStringList::Iterator it = slist.begin(); it != slist.end(); ++it ) {
+	MARK
+		s = *it;
+	MARK
+		s = QDir::convertSeparators(s);
+	MARK
+		p7->encryptFile(cert, s.latin1());
+	MARK
+		p7->writeP7((s + ".p7m").latin1(), true);
+	MARK
+	}
+	delete p7;
+	MARK
+    }
+    catch (errorEx &err) {
+	Error(err);
+    }
+}	
+
+void CertView::popupMenu(QListViewItem *item, const QPoint &pt, int x) {
+	CERR( "popup Cert");
+	QPopupMenu *menu = new QPopupMenu(this);
+	QPopupMenu *subCa = new QPopupMenu(this);
+	QPopupMenu *subP7 = new QPopupMenu(this);
+	QPopupMenu *subExport = new QPopupMenu(this);
+	int itemExtend, itemRevoke, itemTrust, itemCA, itemTemplate, itemReq, itemP7, itemtca;
+	bool canSign, parentCanSign, hasTemplates, hasPrivkey;
+	
+	if (!item) {
+		menu->insertItem(tr("New Certificate"), this, SLOT(newCert()));
+		menu->insertItem(tr("Import"), this, SLOT(loadCert()));
+		menu->insertItem(tr("Import PKCS#12"), this, SLOT(loadPKCS12()));
+		menu->insertItem(tr("Import from PKCS#7"), this, SLOT(loadPKCS7()));
+	}
+	else {
+		pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI(item->text(0).latin1());
+		menu->insertItem(tr("Rename"), this, SLOT(startRenameCert()));
+		menu->insertItem(tr("Show Details"), this, SLOT(showDetailsCert()));
+		menu->insertItem(tr("Export"), subExport);
+		subExport->insertItem(tr("File"), this, SLOT(writeCert()));
+		itemReq = subExport->insertItem(tr("Request"), this, SLOT(toRequest()));
+		itemtca = subExport->insertItem(tr("TinyCA"), this, SLOT(toTinyCA()));
+
+		menu->insertItem(tr("Delete"), this, SLOT(deleteCert()));
+		itemTrust = menu->insertItem(tr("Trust"), this, SLOT(setTrust()));
+		menu->insertSeparator();
+		itemCA = menu->insertItem(tr("CA"), subCa);
+		subCa->insertItem(tr("Serial"), this, SLOT(setSerial()));
+		subCa->insertItem(tr("CRL days"), this, SLOT(setCrlDays()));
+		itemTemplate = subCa->insertItem(tr("Signing Template"), this, SLOT(setTemplate()));
+		subCa->insertItem(tr("Generate CRL"), this, SLOT(genCrl()));
+		
+		itemP7 = menu->insertItem(tr("PKCS#7"), subP7);
+		subP7->insertItem(tr("Sign"), this, SLOT(signP7()));
+		subP7->insertItem(tr("Encrypt"), this, SLOT(encryptP7()));
+		menu->insertSeparator();
+		itemExtend = menu->insertItem(tr("Renewal"), this, SLOT(extendCert()));
+		if (cert) {
+			if (cert->isRevoked()) {
+				itemRevoke = menu->insertItem(tr("Unrevoke"), this, SLOT(unRevoke()));
+				menu->setItemEnabled(itemTrust, false);
+			}
+			else	
+				itemRevoke = menu->insertItem(tr("Revoke"), this, SLOT(revoke()));
+			parentCanSign = (cert->getSigner() && cert->getSigner()->canSign() && (cert->getSigner() != cert));
+			canSign = cert->canSign();
+			hasTemplates = temps->getDesc().count() > 0 ;
+			hasPrivkey = cert->getKey();
+		}
+		menu->setItemEnabled(itemExtend, parentCanSign);
+		menu->setItemEnabled(itemRevoke, parentCanSign);
+		menu->setItemEnabled(itemCA, canSign);
+		subExport->setItemEnabled(itemReq, hasPrivkey);
+		subExport->setItemEnabled(itemtca, canSign);
+		menu->setItemEnabled(itemP7, hasPrivkey);
+		subCa->setItemEnabled(itemTemplate, hasTemplates);
+
+	}
+	menu->exec(pt);
+	delete menu;
+	delete subCa;
+	delete subP7;
+	delete subExport;
+	
+	return;
+}
+
+void CertView::setTrust()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	TrustState_UI *dlg = new TrustState_UI(this,0,true);
+	int state, newstate;
+	state = cert->getTrust();
+	if (cert->getSigner() == cert) {
+		if (state == 1) state = 0;
+		dlg->trust1->setDisabled(true);
+	}
+	if (state == 0 ) dlg->trust0->setChecked(true);
+	if (state == 1 ) dlg->trust1->setChecked(true);
+	if (state == 2 ) dlg->trust2->setChecked(true);
+	dlg->certName->setText(cert->getDescription().c_str());
+	if (dlg->exec()) {
+		if (dlg->trust0->isChecked()) newstate = 0;
+		if (dlg->trust1->isChecked()) newstate = 1;
+		if (dlg->trust2->isChecked()) newstate = 2;
+		if (newstate!=state) {
+			cert->setTrust(newstate);
+			certs->updatePKI(cert);
+			certs->updateViewAll();
+		}
+	}
+	delete dlg;
+}
+
+void CertView::toRequest()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	try {
+		pki_x509req *req = new pki_x509req(cert);
+		insertReq(req);
+	}
+	catch (errorEx &err) {
+		Error(err);
+	}
+	
+}
+
+void CertView::revoke()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	cert->setRevoked(true);
+	CERR("setRevoked..." );
+	certs->updatePKI(cert);
+	CERR("updatePKI done");
+	certs->updateViewAll();
+	CERR("view updated");
+}
+
+void CertView::unRevoke()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	cert->setRevoked(false);
+	certs->updatePKI(cert);
+	certs->updateViewAll();
+}
+
+void CertView::setSerial()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	int serial = cert->getCaSerial();
+	bool ok;
+	int nserial = QInputDialog::getInteger (tr(XCA_TITLE),
+			tr("Please enter the new Serial for signing"),
+			serial, serial, 2147483647, 1, &ok, this );
+	if (ok && nserial > serial) {
+		cert->setCaSerial(nserial);
+		certs->updatePKI(cert);
+	}
+}
+
+void CertView::setCrlDays()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	int crlDays = cert->getCrlDays();
+	bool ok;
+	int nCrlDays = QInputDialog::getInteger (tr(XCA_TITLE),
+			tr("Please enter the CRL renewal periode in days"),
+			crlDays, 1, 2147483647, 1, &ok, this );
+	if (ok && (crlDays != nCrlDays)) {
+		cert->setCrlDays(nCrlDays);
+		certs->updatePKI(cert);
+	}
+}
+
+void CertView::setTemplate()
+{
+	pki_x509 *cert = (pki_x509 *)certs->getSelectedPKI();
+	if (!cert) return;
+	QString templ = cert->getTemplate().c_str();
+	QStringList tempList = temps->getDesc();
+	unsigned int i, sel=0;
+	bool ok;
+	for (i=0; i<tempList.count(); i++) {
+		if (tempList[i] == templ) {
+			sel = i;
+		}
+	}
+	QString nTempl = QInputDialog::getItem (tr(XCA_TITLE),
+			tr("Please select the default Template for signing"),
+			tempList, sel, false, &ok, this );
+	if (ok && (templ != nTempl)) {
+		cert->setTemplate(nTempl.latin1());
+		certs->updatePKI(cert);
+	}
+}
+
+
+void CertView::changeView()
+{
+	if (certs->viewState == 0) { // Plain view
+		certs->viewState = 1;
+		bnViewState->setText(tr("Plain View"));
+	}
+	else { // Tree View
+		certs->viewState = 0;
+		bnViewState->setText(tr("Tree View"));
+	}
+	certs->updateView();
+}
+
+#define fopenerror(file) \
+	QMessageBox::warning(this,tr(XCA_TITLE), \
+       		tr("The file '") + file + tr("' could not be opened"));
+
+void CertView::toTinyCA()
+{
+#ifndef WIN32
+	pki_x509 *crt = (pki_x509 *)certs->getSelectedPKI();
+	if (!crt) return;
+	pki_key *key = crt->getKey();
+	if (!key) return;
+	FILE *fp, *fpr;
+	char buf[200];
+	QList<pki_x509> list;
+	pki_x509 *issuedcert;
+	QString dname = crt->getDescription().c_str();
+	QString tcatempdir = settings->getString("TinyCAtempdir").c_str();
+	QString tcadir = settings->getString("TinyCAdir").c_str();
+	if (tcatempdir.isEmpty()) {
+		tcatempdir = "templates";
+	}
+	if (tcadir.isEmpty()) {
+		tcadir = QDir::homeDirPath();
+		tcadir += QDir::separator();
+		tcadir += ".TinyCA";
+	}
+	ExportTinyCA *dlg = new ExportTinyCA( tcatempdir, tcadir, this, NULL);
+	if (!dlg->exec()) return;
+	
+	tcatempdir = dlg->tempdir->text();
+	tcadir = dlg->tinycadir->text();
+	dname = dlg->dname->text();
+	
+	settings->putString("TinyCAtempdir", tcatempdir.latin1());
+	settings->putString("TinyCAdir", tcadir.latin1());
+	
+	if (dname.isEmpty()) return;
+	const EVP_CIPHER *enc = EVP_des_ede3_cbc();
+	
+	
+	// OK, we have all names now...
+	tcadir += QDir::separator();
+        tcadir += dname;
+	
+	//create directory tree
+	if (! mkDir(tcadir)) return;
+	chdir(tcadir.latin1());
+	if (! mkDir("certs")) return;
+	if (! mkDir("crl")) return;
+	if (! mkDir("keys")) return;
+	if (! mkDir("newcerts")) return;
+	if (! mkDir("req")) return;
+	
+	// write the CA cert and key
+	crt->writeCert("cacert.pem", true, false);
+	key->writeKey("cacert.key", enc, &CertView::passWrite, true);
+	// write the crl
+	chdir("crl");
+	pki_crl *crl = genCrl(crt);
+	crl->writeCrl("crl.pem");
+	delete crl;
+	chdir("..");
+	// write the serial
+	fp = fopen("serial", "w");
+	if (!fp) {
+		fopenerror("serial");
+		return;
+	}
+	fprintf(fp, "%04x", crt->getCaSerial());
+	fclose(fp);
+	
+	// copy openssl.cnf
+	tcatempdir += QDir::separator();
+	tcatempdir += "openssl.cnf";
+	fpr = fopen(tcatempdir.latin1(), "r");
+	if (!fpr) {
+		fopenerror("openssl.cnf" );
+		return;
+	}
+	fp = fopen("openssl.cnf", "w");
+	if (!fp) {
+		fopenerror("openssl.cnf" );
+		fclose(fpr);
+		return;
+	}
+	while (fgets(buf ,200, fpr) != NULL) {
+		char *x = strstr(buf,"%dir%");
+		if (x != 0) {
+			x[0]='\0';
+			fputs(buf, fp);
+			fputs(tcadir.latin1(), fp);
+			fputs(x+5, fp);
+		}
+		else {
+			fputs(buf, fp);
+		}
+	}
+	fclose(fp);
+	fclose(fpr);
+	
+	// store the issued certificates
+	fp = fopen("index.txt", "w");
+        if (!fp) return;
+	list = certs->getIssuedCerts(crt);
+	if (!list.isEmpty()) {
+       		for ( issuedcert = list.first(); issuedcert != NULL; issuedcert = list.next() ) {
+			bool rev = issuedcert->isRevoked();
+			string revdate = issuedcert->revokedAt(TIMEFORM_PLAIN);
+			string nadate = issuedcert->notAfter(TIMEFORM_PLAIN);
+			string fname = issuedcert->tinyCAfname();
+			chdir("certs");
+			crt->writeCert(fname, true, false);
+			chdir("..");
+			key = issuedcert->getKey();
+			if (key) {
+				chdir("keys");
+				key->writeKey(fname, NULL, &CertView::passWrite, true);
+				chdir("..");
+			}
+			fprintf(fp, "%c\t%s\t%s\t%s\tunknown\t%s\n", rev? 'R':'V', 
+					nadate.c_str(), revdate.c_str(), issuedcert->getSerial().c_str(), 
+					issuedcert->subjectOneLine().c_str() );
+			
+		}
+	}
+	fclose(fp);
+	
+#endif	
+}	
+
+bool db_x509::updateView()
+{
+        listView->clear();
+        listView->setRootIsDecorated(true);
+        pki_x509 *pki;
+        pki_base *pkib;
+        pki_x509 *signer;
+        QListViewItem *parentitem;
+        QListViewItem *current;
+        CERR("myUPDATE");
+        if ( container.isEmpty() ) return false;
+        QList<pki_base> mycont = container;
+        for ( pkib = container.first(); pkib != NULL; pkib = container.next() ) pkib->delPointer();
+        int f=0;
+        while (! mycont.isEmpty() ) {
+                CERR("-----------------------------------------------------------------Round "<< f++);
+                QListIterator<pki_base> it(mycont);
+                for ( ; it.current(); ++it ) {
+                        pki = (pki_x509 *)it.current();
+                        parentitem = NULL;
+                        signer = pki->getSigner();
+                        if ((signer != pki) && (signer != NULL) && (viewState != 0)) // foreign signed
+                                parentitem = (QListViewItem *)signer->getPointer();
+                        if (((parentitem != NULL) || (signer == pki) || (signer == NULL) || viewState == 0) && (pki->getPointer() == NULL )) {
+                                // create the listview item
+                                if (parentitem != NULL) {
+                                        current = new QListViewItem(parentitem, pki->getDescription().c_str());
+                                        CERR("Adding as client: "<<pki->getDescription().c_str());
+                                }
+                                else {
+                                        current = new QListViewItem(listView, pki->getDescription().c_str());
+                                        CERR("Adding as parent: "<<pki->getDescription().c_str());
+                                }
+                                pki->setPointer(current);
+                                mycont.remove(pki);
+                                updateViewPKI(pki);
+                                it.toFirst();
+                        }
+                }
+
+        }
+        return true;
+}
+
diff --git a/CertView.h b/CertView.h
new file mode 100644
index 00000000..c21f82b8
--- /dev/null
+++ b/CertView.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2001 Christian Hohnstaedt.
+ *
+ *  All rights reserved.
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *  - Neither the name of the author nor the names of its contributors may be 
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * This program links to software with different licenses from:
+ *
+ *	http://www.openssl.org which includes cryptographic software
+ * 	written by Eric Young (eay@cryptsoft.com)"
+ *
+ *	http://www.sleepycat.com
+ *
+ *	http://www.trolltech.com
+ * 
+ *
+ *
+ * http://www.hohnstaedt.de/xca
+ * email: christian@hohnstaedt.de
+ *
+ * $Id$ 
+ *
+ */                           
+
+
+#ifndef CERTVIEW_H
+#define CERTVIEW_H
+
+#include "XcaListView.h"
+#include "lib/pki_x509.h"
+#include <qlistview.h>
+
+class CertView : public XcaListView
+{
+   Q_OBJECT
+
+   private:
+	QPixmap *keyicon[4];
+   public:
+	CertView(QWidget * parent = 0, const char * name = 0, WFlags f = 0);
+	void show(pki_base *item, bool import);
+	void newItem();
+	void deleteItem();
+	void load();
+	void updateViewItem(pki_base *);
+	pki_base *loadItem(QString fname);
+	pki_base* insert(pki_base *item);
+	void store();
+	void popupMenu(QListViewItem *item, const QPoint &pt, int x);
+   signals:
+	void keyDone(QString &);
+	void init_database();
+
+};	
+
+#endif