1 files changed, 20 insertions, 67 deletions

diff --git a/src/plugins/tls/shared/qasn1element.cpp b/src/plugins/tls/shared/qasn1element.cpp
index 3df76c3774..97be46866d 100644
--- a/src/plugins/tls/shared/qasn1element.cpp
+++ b/src/plugins/tls/shared/qasn1element.cpp
@@ -1,54 +1,22 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Jeremy Lainé <jeremy.laine@m4x.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2014 Jeremy Lainé <jeremy.laine@m4x.org>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include "qasn1element_p.h"
 
 #include <QtCore/qdatastream.h>
 #include <QtCore/qdatetime.h>
+#include <QtCore/qtimezone.h>
 #include <QtCore/qlist.h>
 #include <QDebug>
+#include <private/qtools_p.h>
 
 #include <limits>
 
 QT_BEGIN_NAMESPACE
 
+using namespace QtMiscUtils;
+
 typedef QMap<QByteArray, QByteArray> OidNameMap;
 static OidNameMap createOidMap()
 {
@@ -249,11 +217,6 @@ QDateTime QAsn1Element::toDateTime() const
 
     // QDateTime::fromString is lenient and accepts +- signs in front
     // of the year; but ASN.1 doesn't allow them.
-    const auto isAsciiDigit = [](char c)
-    {
-        return c >= '0' && c <= '9';
-    };
-
     if (!isAsciiDigit(mValue[0]))
         return result;
 
@@ -261,39 +224,29 @@ QDateTime QAsn1Element::toDateTime() const
     if (mValue.back() != 'Z')
         return result;
 
-    // In addition, check that we only have digits representing the
-    // date/time. This should not really be necessary (there's no such
-    // thing as negative months/days/etc.); it's a workaround for
-    // QTBUG-84349.
-    if (!std::all_of(mValue.begin(), mValue.end() - 1, isAsciiDigit))
-        return result;
-
     if (mType == UtcTimeType && mValue.size() == 13) {
-        result = QDateTime::fromString(QString::fromLatin1(mValue),
-                                       QStringLiteral("yyMMddHHmmsst"));
-        if (!result.isValid())
-            return result;
-
-        Q_ASSERT(result.timeSpec() == Qt::UTC);
-
-        QDate date = result.date();
-
         // RFC 2459:
         //   Where YY is greater than or equal to 50, the year shall be
         //   interpreted as 19YY; and
         //
         //   Where YY is less than 50, the year shall be interpreted as 20YY.
         //
-        // QDateTime interprets the 'yy' format as 19yy, so we may need to adjust
-        // the year (bring it in the [1950, 2049] range).
-        if (date.year() < 1950)
-            result.setDate(date.addYears(100));
+        // so use 1950 as base year.
+        constexpr int rfc2459CenturyStart = 1950;
+        const QLatin1StringView inputView(mValue);
+        QDate date = QDate::fromString(inputView.first(6), u"yyMMdd", rfc2459CenturyStart);
+        if (!date.isValid())
+            return result;
 
-        Q_ASSERT(result.date().year() >= 1950);
-        Q_ASSERT(result.date().year() <= 2049);
+        Q_ASSERT(date.year() >= rfc2459CenturyStart);
+        Q_ASSERT(date.year() < 100 + rfc2459CenturyStart);
+
+        QTime time = QTime::fromString(inputView.sliced(6, 6), u"HHmmss");
+        if (!time.isValid())
+            return result;
+        result = QDateTime(date, time, QTimeZone::UTC);
     } else if (mType == GeneralizedTimeType && mValue.size() == 15) {
-        result = QDateTime::fromString(QString::fromLatin1(mValue),
-                                       QStringLiteral("yyyyMMddHHmmsst"));
+        result = QDateTime::fromString(QString::fromLatin1(mValue), u"yyyyMMddHHmmsst");
     }
 
     return result;