*** empty log message ***

This commit is contained in:
chris2511 2003-07-08 19:00:58 +00:00
parent 639f2cc26e
commit 4da20ce414
16 changed files with 37 additions and 18 deletions

View File

@ -23,8 +23,8 @@ AC_ARG_WITH(openssldir, specify an extra dir for openssl,
# enable QTDIR if exist
if test -d "$QTDIR" ; then
export PATH=$QTDIR/bin:$PATH
export CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
export LDFLAGS="$LDFLAGS -L$QTDIR/lib"
export CPPFLAGS="$CPPFLAGS -I$QTDIR/include -I/usr/local/include"
export LDFLAGS="$LDFLAGS -L$QTDIR/lib -L/usr/local/lib"
ac_QTDIR="$QTDIR"
else
export CPPFLAGS="$CPPFLAGS -I/usr/include/qt -I/usr/local/include -I/usr/X11R6/include"

View File

@ -240,6 +240,9 @@ bool const a1time::operator != (const a1time &a)
unsigned char *a1time::d2i(unsigned char *p, int size)
{
unsigned char *mp = p;
if (time)
ASN1_TIME_free(time);
time = NULL;
d2i_ASN1_TIME(&time, &mp, size);
return mp;
}

View File

@ -211,13 +211,13 @@ void db_base::loadContainer()
pki = newPKI();
pki->setIntName(desc);
pki->fromData(p, size);
container.append(pki);
}
catch (errorEx &err) {
QMessageBox::warning(NULL,tr(XCA_TITLE),
tr("Error loading: '") + desc + "'\n" +
err.getCString());
}
container.append(pki);
}
delete (k);
delete (d);

View File

@ -76,7 +76,6 @@ void db_crl::preprocess()
void db_crl::revokeCerts(pki_crl *crl)
{
int numc, i;
pki_x509 *rev, *iss;
x509rev revok;
numc = crl->numRev();
a1int x;

View File

@ -11,13 +11,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>583</width>
<width>579</width>
<height>590</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string></string>
<string>NewX509_UI</string>
</property>
<widget>
<class>QWidget</class>
@ -427,6 +427,10 @@ Of course you need the private key of the CSR if you want to create a self-signe
<name>name</name>
<cstring>serialNr</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>1</string>
</property>
<property>
<name>toolTip</name>
<string>If you leave this blank the serial 00 will be used</string>

View File

@ -54,10 +54,17 @@
#define CERTVIEW_H
#include "XcaListView.h"
/*
#include "lib/pki_x509.h"
#include "lib/pki_pkcs12.h"
#include <qlistview.h>
#include "widgets/NewX509.h"
*/
class pki_pkcs12;
class NewX509;
class pki_base;
class QListViewItem;
class pki_x509req;
class pki_temp;
class CertView : public XcaListView
{

View File

@ -1,5 +1,4 @@
/* vi: set sw=4 ts=4: */
/* vi: set sw=4 ts=4: */
/*
* Copyright (C) 2001 Christian Hohnstaedt.
*
@ -54,6 +53,7 @@
#include "CrlView.h"
#include <qpopupmenu.h>
#include <qmessagebox.h>
#include <qlineedit.h>
#include "widgets/CrlDetail.h"
#include "lib/pki_crl.h"
#include "widgets/MainWindow.h"
@ -210,15 +210,15 @@ void CrlView::popupMenu(QListViewItem *item, const QPoint &pt, int x) {
QPopupMenu *subExport = new QPopupMenu(this);
if (!item) {
menu->insertItem(tr("Import"), this, SLOT(loadCrl()));
menu->insertItem(tr("Import"), this, SLOT(load()));
}
else {
menu->insertItem(tr("Rename"), this, SLOT(startRenameCrl()));
menu->insertItem(tr("Show Details"), this, SLOT(showDetailsCrl()));
menu->insertItem(tr("Rename"), this, SLOT(startRename()));
menu->insertItem(tr("Show Details"), this, SLOT(showItem()));
menu->insertItem(tr("Export"), subExport);
subExport->insertItem(tr("PEM"), this, SLOT(writeCrl_pem()));
subExport->insertItem(tr("DER"), this, SLOT(writeCrl_der()));
menu->insertItem(tr("Delete"), this, SLOT(deleteCrl()));
menu->insertItem(tr("Delete"), this, SLOT(deleteItem()));
}
menu->exec(pt);
delete menu;

View File

@ -74,10 +74,10 @@ class CrlView : public XcaListView
pki_base* insert(pki_base *item);
void store(bool);
void popupMenu(QListViewItem *item, const QPoint &pt, int x);
void writeCrl_pem();
void writeCrl_der();
public slots:
pki_crl *newItem(pki_x509 *cert);
void writeCrl_pem();
void writeCrl_der();
private slots:
void dlg_showCert(QListViewItem *i);
void dlg_showCert(QString name);

View File

@ -58,6 +58,8 @@
#include <qcombobox.h>
#include <qlabel.h>
#include <qprogressdialog.h>
#include <qpushbutton.h>
#include <qlineedit.h>
#include <qtextview.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>

View File

@ -78,7 +78,6 @@ class KeyView : public XcaListView
void importKey(pki_key *k);
signals:
void keyDone(QString);
void init_database();
};

View File

@ -57,6 +57,7 @@
#include <qfiledialog.h>
#include <qdir.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include <qpushbutton.h>

View File

@ -67,7 +67,6 @@ class ReqView : public XcaListView
ReqView(QWidget * parent = 0, const char * name = 0, WFlags f = 0);
void showItem(pki_base *item, bool import);
void newItem();
void newItem(pki_temp *temp);
void deleteItem();
void load();
void updateViewItem(pki_base *);
@ -79,6 +78,7 @@ class ReqView : public XcaListView
void writeReq_pem();
void writeReq_der();
void signReq();
void newItem(pki_temp *temp);
signals:
void newCert(pki_x509req *req);

View File

@ -84,7 +84,6 @@ class TempView : public XcaListView
void alterTemp();
void deleteItem();
signals:
void init_database();
void newReq(pki_temp *);
void newCert(pki_temp *);
};

View File

@ -56,6 +56,7 @@
#include <qlabel.h>
#include <qtextview.h>
#include <qpushbutton.h>
#include <qlineedit.h>
CertDetail::CertDetail(QWidget *parent, const char *name, bool modal, WFlags f)
:CertDetail_UI(parent,name,true,0)

View File

@ -57,6 +57,7 @@
#include <qlabel.h>
#include <qtextview.h>
#include <qlistview.h>
#include <qlineedit.h>
CrlDetail::CrlDetail(QWidget *parent, const char *name, bool modal, WFlags f)
:CrlDetail_UI(parent, name, modal, f)
@ -101,7 +102,7 @@ void CrlDetail::setCrl(pki_crl *crl)
descr->setText(crl->getIntName());
lUpdate->setText(crl->getLastUpdate().toPretty());
nUpdate->setText(crl->getNextUpdate().toPretty());
version->setText(crl->getVersion().toHex());
version->setText((++crl->getVersion()).toHex());
// page 2
issuer->setX509name(crl->getIssuerName());

View File

@ -55,6 +55,7 @@
#include <qlabel.h>
#include <qpushbutton.h>
#include <qlistview.h>
#include <qlineedit.h>
#include "lib/pki_pkcs12.h"
#include "view/KeyView.h"
#include "view/ReqView.h"
@ -154,6 +155,8 @@ MainWindow::MainWindow(QWidget *parent, const char *name )
keyList, SLOT(importKey(pki_key *)) );
connect( tempList, SIGNAL(newCert(pki_temp *)),
certList, SLOT(newCert(pki_temp *)) );
connect( tempList, SIGNAL(newReq(pki_temp *)),
reqList, SLOT(newItem(pki_temp *)) );
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();