summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-07-19 09:47:29 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-07-19 09:47:29 +0200
commit407302fb1b823fbe0ae09c031862f87b252489e6 (patch)
treef192faf40b9009ee6a884ed4b7d0b3942b6810ac /tests/auto/network/ssl
parent0f30dcaea8129092142fe87d2d14209c75363f66 (diff)
parentad3b41a06d9ba7219c79b5548c5b11698787288d (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'tests/auto/network/ssl')
-rw-r--r--tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp27
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp b/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp
index 401ed85587..0928ecc5a1 100644
--- a/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp
+++ b/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp
@@ -134,6 +134,33 @@ void tst_QAsn1Element::dateTime_data()
QTest::newRow("UTCTime - no trailing Z")
<< QByteArray::fromHex("170d30373034313730373430323659")
<< QDateTime();
+ QTest::newRow("UTCTime - year 1950")
+ << QByteArray::fromHex("170d3530313232343035353530305a")
+ << QDateTime(QDate(1950, 12, 24), QTime(5, 55), Qt::UTC);
+ QTest::newRow("UTCTime - year 1999")
+ << QByteArray::fromHex("170d3939313232343035353530305a")
+ << QDateTime(QDate(1999, 12, 24), QTime(5, 55), Qt::UTC);
+ QTest::newRow("UTCTime - year 2000")
+ << QByteArray::fromHex("170d3030313232343035353530305a")
+ << QDateTime(QDate(2000, 12, 24), QTime(5, 55), Qt::UTC);
+ QTest::newRow("UTCTime - year 2049")
+ << QByteArray::fromHex("170d3439313232343035353530305a")
+ << QDateTime(QDate(2049, 12, 24), QTime(5, 55), Qt::UTC);
+ QTest::newRow("UTCTime - invalid year ('-9')")
+ << QByteArray::fromHex("170d2d39313232343035353530305a")
+ << QDateTime();
+ QTest::newRow("UTCTime - invalid year ('*9')")
+ << QByteArray::fromHex("170d2a39313232343035353530305a")
+ << QDateTime();
+ QTest::newRow("UTCTime - invalid year ('5*')")
+ << QByteArray::fromHex("170d352a313232343035353530305a")
+ << QDateTime();
+ QTest::newRow("UTCTime - invalid year ('AB')")
+ << QByteArray::fromHex("170d4142313232343035353530305a")
+ << QDateTime();
+ QTest::newRow("UTCTime - invalid year ('+1')")
+ << QByteArray::fromHex("170d2b31313232343035353530305a")
+ << QDateTime();
QTest::newRow("GeneralizedTime - 20510829095341Z")
<< QByteArray::fromHex("180f32303531303832393039353334315a")
<< QDateTime(QDate(2051, 8, 29), QTime(9, 53, 41), Qt::UTC);