The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Certificate renewal fixed

Browse Source 
Export P7 completed
Signals of newKeys refixed
This commit is contained in:
Christian 2006-05-22 23:11:21 +02:00
parent f83f783549
commit 6be660c3f6
12 changed files with 158 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/db_key.cpp
View File

@ -185,9 +185,9 @@ void db_key::newItem()
status->removeWidget(bar);
delete bar;
status->showMessage(m);
insert(nkey);
emit keyDone(nkey);
nkey = (pki_key*)insert(nkey);
printf("Emit KeyDone\n");
emit keyDone(nkey->getIntNameWithType());
}
delete dlg;
}

2
lib/db_key.h
View File

@ -85,7 +85,7 @@ class db_key: public db_base
signals:
void delKey(pki_key *delkey);
void newKey(pki_key *newkey);
void keyDone(pki_key *newkey);
void keyDone(QString name);
};
#endif

98
lib/db_x509.cpp
View File

@ -51,6 +51,7 @@
#include "pki_pkcs12.h"
#include "pki_pkcs7.h"
#include "widgets/CertDetail.h"
#include "widgets/CertExtend.h"
#include "widgets/ExportCert.h"
#include "ui/TrustState.h"
#include <Qt/qmessagebox.h>
@ -747,39 +748,30 @@ void db_x509::writePKCS7(pki_x509 *cert, QString s, int type)
QList<pki_base> list;
pki_base *cer;
try {
p7 = new pki_pkcs7("");
if ( type == P7_CHAIN ) {
while (cert != NULL) {
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 (cert->getSigner() == cert) cert = NULL;
else cert = cert->getSigner();
}
}
if ( type == P7_ONLY ) {
p7->addCert(cert);
}
#if 0
if (type == P7_TRUSTED) {
list = db->getContainer();
if (!list.isEmpty()) {
for ( cer = list.first(); cer != NULL; cer = list.next() ) {
if (((pki_x509*)cer)->getTrust() == 2)
p7->addCert((pki_x509 *)cer);
if (type == P7_TRUSTED) {
FOR_ALL_pki(cer, pki_x509) {
if (cer->getTrust() == 2)
p7->addCert(cer);
}
}
}
if (type == P7_ALL) {
list = db->getContainer();
if (!list.isEmpty()) {
for ( cer = list.first(); cer != NULL; cer = list.next() ) {
if (type == P7_ALL) {
FOR_ALL_pki(cer, pki_x509)
p7->addCert((pki_x509 *)cer);
}
}
}
#else
#warning P7_TRUSTED P7_ALL
#endif
p7->writeP7(s, false);
p7->writeP7(s, false);
}
catch (errorEx &err) {
MainWindow::Error(err);
@ -916,3 +908,55 @@ void db_x509::setTrust()
delete dlg;
}
void db_x509::extendCert()
{
pki_x509 *oldcert = NULL, *signer = NULL, *newcert =NULL;
pki_key *signkey = NULL;
a1time time;
a1int serial;
try {
CertExtend *dlg = new CertExtend(mainwin);
if (!dlg->exec()) {
delete dlg;
return;
}
oldcert = static_cast<pki_x509*>(currentIdx.internalPointer());
if (!oldcert ||
!(signer = oldcert->getSigner()) ||
!(signkey = signer->getRefKey()) ||
signkey->isPubKey())
return;
newcert = new pki_x509(oldcert);
serial = signer->getIncCaSerial();
// get signers own serial to avoid having the same
if (serial == signer->getSerial()) {
serial = signer->getIncCaSerial(); // just take the next one
}
updatePKI(signer);
// change date and serial
newcert->setSerial(serial);
newcert->setNotBefore(dlg->notBefore->getDate());
newcert->setNotAfter(dlg->notAfter->getDate());
if (newcert->resetTimes(signer) > 0) {
if (QMessageBox::information(mainwin, 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, oldcert->getDigest());
insert(newcert);
delete dlg;
}
catch (errorEx &err) {
MainWindow::Error(err);
if (newcert)
delete newcert;
}
}

1
lib/db_x509.h
View File

@ -102,6 +102,7 @@ class db_x509: public db_x509super
void showItem();
void setMultiTrust(QAbstractItemView* view);
void setTrust();
void extendCert();
signals:
void connNewX509(NewX509 *dlg);
};

22
lib/db_x509req.cpp
View File

@ -128,15 +128,12 @@ void db_x509req::load(void)
load_default(l);
}
void db_x509req::showItem()
void db_x509req::showItem(pki_x509req *req)
{
if (!currentIdx.isValid())
if (!req)
return;
pki_x509req *req = static_cast<pki_x509req*>(currentIdx.internalPointer());
ReqDetail *dlg;
printf("ShowItem req\n");
dlg = new ReqDetail(mainwin);
if (dlg) {
dlg->setReq(req);
@ -145,6 +142,21 @@ void db_x509req::showItem()
}
}
void db_x509req::showItem()
{
if (!currentIdx.isValid())
return;
pki_x509req *req = static_cast<pki_x509req*>(currentIdx.internalPointer());
showItem(req);
}
void db_x509req::showItem(QString descr)
{
pki_x509req *req = (pki_x509req*)getByName(descr);
showItem(req);
}
void db_x509req::store(bool pem)
{
if (!currentIdx.isValid())

2
lib/db_x509req.h
View File

@ -72,6 +72,8 @@ class db_x509req: public db_x509super
void store_der() {store(false);}
void load(void);
void showItem();
void showItem(QString descr);
void showItem(pki_x509req *req);
signals:
void connNewX509(NewX509 *dlg);
};

23
lib/pki_base.cpp
View File

@ -76,17 +76,6 @@ enum pki_type pki_base::getType()
return pkiType;
}
#if 0
// FIXME: remove if unneeded
void pki_base::fload(const QString fname)
{
}
void pki_base::writeDefault(const QString fname)
{
}
#endif
pki_base::~pki_base(void)
{
pki_counter--;
@ -164,18 +153,6 @@ QString pki_base::rmslashdot(const QString &s)
return s.mid(l+1,r-l-1);
}
#if 0
// FIXME: remove if unneeded
void pki_base::updateView()
{
if (pointer == NULL) return;
#ifdef qt3
pointer->setRenameEnabled(0,true);
#endif
pointer->setText(0, getIntName());
}
#endif
pki_base *pki_base::getParent()
{
return parent;

16
ui/NewX509.ui
View File

@ -145,7 +145,7 @@ Of course you need the private key of the CSR if you want to create a self-signe
</widget>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="pushButton" >
<widget class="QPushButton" name="showReqBut" >
<property name="text" >
<string>Show request</string>
</property>
@ -916,7 +916,7 @@ URI:http://www.my.com/my.crl, URI:http://www.oth.com/my.crl</string>
<item row="3" column="1" >
<widget class="QComboBox" name="aiaOid" >
<property name="toolTip" >
<string>can be altered by the file &quot;aia.txt&quot;</string>
<string>can be altered by the file "aia.txt"</string>
</property>
</widget>
</item>
@ -955,7 +955,7 @@ caIssuers;URI:http://my.ca/ca.html</string>
<string>DNS: IP: URI: email: RID:</string>
</property>
<property name="whatsThis" >
<string>The subject alternative name extension allows various literal values to be used. These include &quot;email&quot; (an email address) , &quot;URI&quot; a uniform resource indicator, &quot;DNS&quot; (a DNS domain name) , RID (a registered ID: OBJECT IDENTIFIER) and IP (an IP address).
<string>The subject alternative name extension allows various literal values to be used. These include "email" (an email address) , "URI" a uniform resource indicator, "DNS" (a DNS domain name) , RID (a registered ID: OBJECT IDENTIFIER) and IP (an IP address).
Examples:
email:my@other.address, IP: 1.1.1.1 , URI:http://my.url.here/
email:my@other.address, RID:1.2.3.4, DNS: ns.server.tld</string>
@ -989,7 +989,7 @@ email:my@other.address, RID:1.2.3.4, DNS: ns.server.tld</string>
<string>DNS: IP: URI: email: RID:</string>
</property>
<property name="whatsThis" >
<string>The issuer alternative name extension allows various literal values to be used. These include &quot;email&quot; (an email address) , &quot;URI&quot; a uniform resource indicator, &quot;DNS&quot; (a DNS domain name), RID (a registered ID: OBJECT IDENTIFIER) and IP (an IP address).
<string>The issuer alternative name extension allows various literal values to be used. These include "email" (an email address) , "URI" a uniform resource indicator, "DNS" (a DNS domain name), RID (a registered ID: OBJECT IDENTIFIER) and IP (an IP address).
Examples:
email:my@other.address, IP: 1.1.1.1 , URI:http://my.url.here/
email:my@other.address, RID:1.2.3.4, DNS: ns.server.tld</string>
@ -1453,8 +1453,8 @@ Example:
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>510</x>
<y>576</y>
<x>485</x>
<y>509</y>
</hint>
<hint type="destinationlabel" >
<x>96</x>
@ -1469,8 +1469,8 @@ Example:
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>98</x>
<y>576</y>
<x>86</x>
<y>509</y>
</hint>
<hint type="destinationlabel" >
<x>179</x>

2
widgets/CertExtend.h
View File

@ -52,7 +52,7 @@
class pki_key;
class CertExtend: public QDialog, private Ui::CertExtend
class CertExtend: public QDialog, public Ui::CertExtend
{
Q_OBJECT

2
widgets/MainWindow.cpp
View File

@ -499,9 +499,9 @@ NewX509 *MainWindow::newX509()
void MainWindow::connNewX509(NewX509 *nx)
{
printf("CONNECTING NewX509\n");
connect( (const QObject *)nx->genKeyBUT, SIGNAL(clicked()), keys, SLOT(newItem()) );
connect( nx, SIGNAL(genKey()), keys, SLOT(newItem()) );
connect( keys, SIGNAL(keyDone(QString)), nx, SLOT(newKeyDone(QString)) );
connect( nx, SIGNAL(showReq(QString)), reqs, SLOT(showItem(QString)));
}
void MainWindow::changeView()

118
widgets/NewX509.cpp
View File

@ -68,9 +68,10 @@
#include "lib/oid.h"
#include "lib/func.h"
#if 0
#define TRACE printf("File: "__FILE__" Func: %s Line: %d\n",__func__, __LINE__);
#define TRACE
#endif
int NewX509::name_nid[] = {
NID_commonName,
NID_countryName,
@ -90,19 +91,13 @@ NewX509::NewX509(QWidget *parent)
aia_nid = *MainWindow::aia_nid;
QStringList sl;
TRACE
setupUi(this);
TRACE
sl << "Type" << "Content";
printf("Set Ext DN list\n");
TRACE
extDNlist->setColumnCount(2);
TRACE
extDNlist->setHorizontalHeaderLabels(sl);
TRACE
setWindowTitle(tr(XCA_TITLE));
TRACE
fixtemp = NULL;
nsImg->setPixmap(*MainWindow::nsImg);
@ -111,84 +106,61 @@ NewX509::NewX509(QWidget *parent)
QStringList strings;
// are there any useable private keys ?
TRACE
strings = MainWindow::keys->get0PrivateDesc();
keyList->insertItems(0, strings);
TRACE
hashAlgo->setCurrentIndex(2);
TRACE
if (!strings.isEmpty())
on_keyList_highlighted(strings[0]);
TRACE
// any PKCS#10 requests to be used ?
TRACE
strings = MainWindow::reqs->getDesc();
if (strings.isEmpty()) {
fromReqCB->setDisabled(true);
TRACE
reqList->setDisabled(true);
fromReqCB->setChecked(false);
}
else {
reqList->insertItems(0, strings);
TRACE
}
on_fromReqCB_clicked();
// How about signing certificates ?
TRACE
strings = MainWindow::certs->getSignerDesc();
if (strings.isEmpty()) {
foreignSignRB->setDisabled(true);
TRACE
certList->setDisabled(true);
TRACE
}
else {
} else {
certList->insertItems(0, strings);
TRACE
}
// set dates to now and now + 1 year
a1time a;
notBefore->setDate(a.now());
TRACE
notAfter->setDate(a.now(60*60*24*365));
TRACE
// settings for the templates ....
strings.clear();
TRACE
strings = MainWindow::temps->getDesc();
strings.prepend(tr("Server Template"));
strings.prepend(tr("Client Template"));
TRACE
strings.prepend(tr("CA Template"));
TRACE
strings.prepend(tr("Empty Template"));
tempList->insertItems(0, strings);
TRACE
// setup Extended keyusage
TRACE
for (i=0; i < eku_nid.count(); i++)
ekeyUsage->insertItem(0, OBJ_nid2ln(eku_nid[i]));
// setup Distinguished Name
TRACE
for (i=0; i < dn_nid.count(); i++)
extDNobj->insertItem(0, OBJ_nid2ln(dn_nid[i]));
// setup Authority Info Access
TRACE
for (i=0; i < aia_nid.count(); i++)
aiaOid->insertItem(0, OBJ_nid2ln(aia_nid[i]));
// init the X509 v3 context
TRACE
X509V3_set_ctx(&ext_ctx, NULL , NULL, NULL, NULL, 0);
TRACE
X509V3_set_ctx_nodb((&ext_ctx));
TRACE
// setup the list of x509nameEntrys
name_ptr[0] = commonName;
@ -201,9 +173,8 @@ NewX509::NewX509(QWidget *parent)
// last polish
signerChanged();
TRACE
checkAuthKeyId();
TRACE
toggleOkBut();
pt = none;
}
@ -385,20 +356,15 @@ void NewX509::toTemplate(pki_temp *temp)
void NewX509::on_fromReqCB_clicked()
{
if (fromReqCB->isChecked()) {
reqList->setEnabled(true);
distNameBox->setEnabled(false);
//privKeyBox->setEnabled(false);
//keyIdentBox->setEnabled(false);
//tabWidget->setTabEnabled(1,false);
}
else {
reqList->setEnabled(false);
distNameBox->setEnabled(true);
//privKeyBox->setEnabled(true);
//keyIdentBox->setEnabled(true);
//tabWidget->setTabEnabled(1,true);
}
bool request = fromReqCB->isChecked();
reqList->setEnabled(request);
distNameBox->setEnabled( ! request);
privKeyBox->setEnabled( ! request);
copyReqExtCB->setEnabled(request);
showReqBut->setEnabled(request);
//keyIdentBox->setEnabled(false);
//tabWidget->setTabEnabled(1,false);
}
@ -410,12 +376,35 @@ void NewX509::on_keyList_highlighted(const QString &keyname)
hashAlgo->setDisabled(false);
}
void NewX509::dataChangeP2()
void NewX509::toggleOkBut()
{
if (description->text() != "" && countryName->text().length() !=1 &&
(keyList->count() > 0 || !keyList->isEnabled())){
}
bool ok = description->text() != "" &&
countryName->text().length() !=1 &&
(keyList->count() > 0 || !keyList->isEnabled());
okButton->setEnabled(ok);
}
void NewX509::on_description_textChanged(QString text)
{
toggleOkBut();
}
void NewX509::on_countryName_textChanged(QString text)
{
toggleOkBut();
}
void NewX509::on_showReqBut_clicked()
{
QString req = reqList->currentText();
emit showReq(req);
}
void NewX509::on_genKeyBUT_clicked()
{
emit genKey();
}
#if 0
void NewX509::showPage(QWidget *page)
{
@ -429,7 +418,7 @@ void NewX509::showPage(QWidget *page)
if (keyList->isEnabled() && keyList->count() == 0 ) {
emit genKey();
}
dataChangeP2();
toggleOkBut();
}
if (page == page7) {
@ -534,22 +523,7 @@ void NewX509::templateChanged()
#endif
}
#if 0
void NewX509::switchExtended()
{
if ( !appropriate(page1) ) return;
if (changeDefault->isChecked() || !templateBox->isEnabled()) {
setAppropriate(page4, true);
setAppropriate(page5, true);
setAppropriate(page6, true);
}
else {
setAppropriate(page4, false);
setAppropriate(page5, false);
setAppropriate(page6, false);
}
}
#endif
void NewX509::checkAuthKeyId()
{
bool enabled = false;
@ -576,7 +550,9 @@ void NewX509::newKeyDone(QString name)
{
keyList->insertItem(0, name);
keyList->setCurrentIndex(0);
dataChangeP2();
on_keyList_highlighted(name);
toggleOkBut();
printf("NEW KEY DONE\n");
}
void NewX509::helpClicked()

7
widgets/NewX509.h
View File

@ -129,7 +129,7 @@ class NewX509: public QDialog, public Ui::NewX509
public slots:
void on_fromReqCB_clicked();
void on_keyList_highlighted(const QString &keyname);
void dataChangeP2();
void toggleOkBut();
void newKeyDone(QString name);
//void switchExtended();
void templateChanged();
@ -144,8 +144,13 @@ class NewX509: public QDialog, public Ui::NewX509
void on_editAuthInfAcc_clicked();
void on_foreignSignRB_clicked();
void on_subKey_clicked();
void on_genKeyBUT_clicked();
void on_showReqBut_clicked();
void on_description_textChanged(QString text);
void on_countryName_textChanged(QString);
signals:
void genKey();
void showReq(QString req);
};
#endif