mirror of
https://github.com/chris2511/xca.git
synced 2026-09-13 18:46:25 +05:00
fix date settings in Certificate renewal dialog
- lib/func.cpp just indentation - set the default to 1 year and apply it.
This commit is contained in:
Christian Hohnstaedt
parent
ab5b066198
commit
717ec4702c
@ -1,4 +1,6 @@
|
||||
|
||||
|
||||
* fix date settings in Certificate renewal dialog
|
||||
* change the hashing for the default password.
|
||||
this makes it incompatible to older versions
|
||||
* Major changes for MAC OS X
|
||||
|
||||
34
lib/func.cpp
34
lib/func.cpp
@ -201,27 +201,29 @@ void applyTD(QWidget *parent, int number, int range, bool mnc,
|
||||
Validity *nb, Validity *na)
|
||||
{
|
||||
#define d_fac (60 * 60 * 24)
|
||||
int faktor[] = { 1, 30, 365 }, midnight, delta;
|
||||
a1time a;
|
||||
time_t t;
|
||||
int faktor[] = { 1, 30, 365 }, midnight, delta;
|
||||
a1time a;
|
||||
time_t t;
|
||||
|
||||
midnight = mnc? 1:0;
|
||||
midnight = mnc ? 1:0;
|
||||
|
||||
if (range>2 || range<0) range = 0;
|
||||
time(&t);
|
||||
delta = faktor[range] * number;
|
||||
if (range>2 || range<0)
|
||||
range = 0;
|
||||
time(&t);
|
||||
delta = faktor[range] * number;
|
||||
|
||||
// one day less if we go from 0:00:00 to 23:59:59
|
||||
if (mnc) delta -=1;
|
||||
if (mnc)
|
||||
delta -=1;
|
||||
|
||||
t /= d_fac;
|
||||
if (delta + t > 24850){
|
||||
QMessageBox::warning(parent, XCA_TITLE,
|
||||
"Time difference too big\nYou must set it manually." );
|
||||
return;
|
||||
}
|
||||
nb->setDate(a.now(), midnight);
|
||||
na->setDate(a.now(delta * d_fac), midnight* (-1));
|
||||
t /= d_fac;
|
||||
if (delta + t > 24850) {
|
||||
QMessageBox::warning(parent, XCA_TITLE,
|
||||
"Time difference too big\nYou must set it manually." );
|
||||
return;
|
||||
}
|
||||
nb->setDate(a.now(), midnight);
|
||||
na->setDate(a.now(delta * d_fac), midnight* (-1));
|
||||
}
|
||||
|
||||
QString asn1ToQString(const ASN1_STRING *str)
|
||||
|
||||
123
ui/CertExtend.ui
123
ui/CertExtend.ui
@ -5,28 +5,46 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>393</width>
|
||||
<height>333</height>
|
||||
<width>450</width>
|
||||
<height>335</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string/>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
@ -102,30 +120,60 @@
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_2" >
|
||||
<property name="title" >
|
||||
<string>Validity</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="margin" >
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="horizontalSpacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="verticalSpacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
@ -159,10 +207,22 @@
|
||||
<string>Time range</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="margin" >
|
||||
<property name="leftMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<property name="topMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="horizontalSpacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="verticalSpacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="1" >
|
||||
@ -197,9 +257,7 @@
|
||||
<item row="1" column="1" >
|
||||
<widget class="QPushButton" name="applyTime" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>5</vsizetype>
|
||||
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
@ -232,18 +290,25 @@
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="PushButton3" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
@ -275,9 +340,7 @@
|
||||
<item>
|
||||
<widget class="QPushButton" name="PushButton2" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
|
||||
@ -25,8 +25,9 @@ CertExtend::CertExtend(QWidget *parent)
|
||||
a1time time;
|
||||
setWindowTitle(tr(XCA_TITLE));
|
||||
image->setPixmap(*MainWindow::certImg);
|
||||
notBefore->setDate(time.now());
|
||||
notAfter->setDate(time.now(60 * 60 * 24 * 356));
|
||||
validNumber->setText("1");
|
||||
validRange->setCurrentIndex(2);
|
||||
applyTimeDiff();
|
||||
}
|
||||
|
||||
void CertExtend::applyTimeDiff()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user