mirror of
https://github.com/chris2511/xca.git
synced 2026-09-14 11:06:19 +05:00
first correct dates, then check whether they are exchanged
This commit is contained in:
parent
766025026e
commit
d3f3ca29a3
@ -947,26 +947,6 @@ void NewX509::accept()
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (notBefore->getDate() > notAfter->getDate()) {
|
||||
gotoTab(2);
|
||||
QString text = tr("The certificate will be out of date before it becomes valid. You most probably mixed up both dates.");
|
||||
QMessageBox msg(QMessageBox::Warning, XCA_TITLE,
|
||||
text, QMessageBox::NoButton, this);
|
||||
msg.addButton(QMessageBox::Ok)->setText(tr("Edit dates"));
|
||||
msg.addButton(QMessageBox::Close)->setText(tr("Abort rollout"));
|
||||
msg.addButton(QMessageBox::Apply)->setText("Continue rollout");
|
||||
switch (msg.exec())
|
||||
{
|
||||
case QMessageBox::Ok:
|
||||
case QMessageBox::Cancel:
|
||||
return;
|
||||
case QMessageBox::Close:
|
||||
reject();
|
||||
return;
|
||||
case QMessageBox::Apply:
|
||||
break;
|
||||
}
|
||||
}
|
||||
pki_x509 *signer = NULL;
|
||||
if (!selfSignRB->isChecked())
|
||||
signer = getSelectedSigner();
|
||||
@ -1036,6 +1016,26 @@ void NewX509::accept()
|
||||
notAfter->setDate(signer->getNotAfter());
|
||||
}
|
||||
}
|
||||
if (notBefore->getDate() > notAfter->getDate()) {
|
||||
gotoTab(2);
|
||||
QString text = tr("The certificate will be out of date before it becomes valid. You most probably mixed up both dates.");
|
||||
QMessageBox msg(QMessageBox::Warning, XCA_TITLE,
|
||||
text, QMessageBox::NoButton, this);
|
||||
msg.addButton(QMessageBox::Ok)->setText(tr("Edit dates"));
|
||||
msg.addButton(QMessageBox::Close)->setText(tr("Abort rollout"));
|
||||
msg.addButton(QMessageBox::Apply)->setText("Continue rollout");
|
||||
switch (msg.exec())
|
||||
{
|
||||
case QMessageBox::Ok:
|
||||
case QMessageBox::Cancel:
|
||||
return;
|
||||
case QMessageBox::Close:
|
||||
reject();
|
||||
return;
|
||||
case QMessageBox::Apply:
|
||||
break;
|
||||
}
|
||||
}
|
||||
on_adv_validate_clicked();
|
||||
if (checkExtDuplicates()) {
|
||||
gotoTab(5);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user