Changeset 561 for trunk/src/network/ssl/qsslcertificate.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/ssl/qsslcertificate.cpp (modified) (21 diffs)

trunk/src/network/ssl/qsslcertificate.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
@@ -72 +72 @@
     certificate, its subject, and its issuer, by calling one of the
     many accessor functions, including version(), serialNumber(),
-    issuerInfo() and subjectInfo(). You can call notValidBefore() and
-    notValidAfter() to check when the certificate was issued, and when
-    it expires. The publicKey() function returns the certificate
+    issuerInfo() and subjectInfo(). You can call effectiveDate() and
+    expiryDate() to check when the certificate starts being
+    effective and when it expires.
+    The publicKey() function returns the certificate
     subject's public key as a QSslKey. You can call issuerInfo() or
     subjectInfo() to get detailed information about the certificate
@@ -126 +127 @@
 QT_BEGIN_NAMESPACE
 
+// forward declaration
+static QMap<QString, QString> _q_mapFromOnelineName(char *name);
+
 /*!
     Constructs a QSslCertificate by reading \a format encoded data
@@ -158 +162 @@
 QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d)
 {
-    d->ref.ref();
 }
 
@@ -166 +169 @@
 QSslCertificate::~QSslCertificate()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
@@ -176 +177 @@
 QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other)
 {
-    qAtomicAssign(d, other.d);
+    d = other.d;
     return *this;
 }
@@ -242 +243 @@
     if (isNull())
         return;
-    if (d->ref == 1)
-        delete d;
-    else
-        d->ref.deref();
-
     d = new QSslCertificatePrivate;
 }
@@ -255 +251 @@
 QByteArray QSslCertificate::version() const
 {
+    if (d->versionString.isEmpty() && d->x509)
+        d->versionString =
+            QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
+
     return d->versionString;
 }
 
 /*!
-    Returns the certificate's serial number string.
+    Returns the certificate's serial number string in decimal format.
 */
 QByteArray QSslCertificate::serialNumber() const
 {
+    if (d->serialNumberString.isEmpty() && d->x509)
+        d->serialNumberString =
+            QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->serialNumber)));
+
     return d->serialNumberString;
 }
@@ -268 +272 @@
 /*!
     Returns a cryptographic digest of this certificate. By default,
-    and MD5 digest will be generated, but you can also specify a
+    an MD5 digest will be generated, but you can also specify a
     custom \a algorithm.
 */
@@ -301 +305 @@
 QString QSslCertificate::issuerInfo(SubjectInfo info) const
 {
+    if (d->issuerInfo.isEmpty() && d->x509)
+        d->issuerInfo =
+                _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_issuer_name(d->x509), 0, 0));
+
     return d->issuerInfo.value(_q_SubjectInfoToString(info));
 }
@@ -328 +336 @@
 QString QSslCertificate::subjectInfo(SubjectInfo info) const
 {
+    if (d->subjectInfo.isEmpty() && d->x509)
+        d->subjectInfo =
+                _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_subject_name(d->x509), 0, 0));
+
     return d->subjectInfo.value(_q_SubjectInfoToString(info));
 }
@@ -363 +375 @@
         return result;
 
-    STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
+    STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME)*)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
 
     if (altNames) {
@@ -378 +390 @@
 
             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
+            const QString altName = QString::fromLatin1(altNameStr, len);
             if (genName->type == GEN_DNS)
                 result.insert(QSsl::DnsEntry, altName);
@@ -384 +396 @@
                 result.insert(QSsl::EmailEntry, altName);
         }
-        q_sk_free(altNames);
+        q_sk_pop_free((STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_sk_free));
     }
 
@@ -611 +623 @@
     array = array.toBase64();
     QByteArray tmp;
-    for (int i = 0; i < array.size() - 64; i += 64) {
+    for (int i = 0; i <= array.size() - 64; i += 64) {
         tmp += QByteArray::fromRawData(array.data() + i, 64);
         tmp += "\n";
@@ -662 +674 @@
     if (!x509 || !QSslSocket::supportsSsl())
         return certificate;
-
-    certificate.d->issuerInfo =
-        _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_issuer_name(x509), 0, 0));
-    certificate.d->subjectInfo =
-        _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_subject_name(x509), 0, 0));
 
     ASN1_TIME *nbef = q_X509_get_notBefore(x509);
@@ -687 +694 @@
 
     if (ch == '\n') {
-        *offset++;
+        *offset += 1;
         return true;
     }
@@ -767 +774 @@
     debug << "QSslCertificate("
           << certificate.version()
-          << "," << certificate.serialNumber()
-          << "," << certificate.digest().toBase64()
-          << "," << certificate.issuerInfo(QSslCertificate::Organization)
-          << "," << certificate.subjectInfo(QSslCertificate::Organization)
-          << "," << certificate.alternateSubjectNames()
+          << ',' << certificate.serialNumber()
+          << ',' << certificate.digest().toBase64()
+          << ',' << certificate.issuerInfo(QSslCertificate::Organization)
+          << ',' << certificate.subjectInfo(QSslCertificate::Organization)
+          << ',' << certificate.alternateSubjectNames()
 #ifndef QT_NO_TEXTSTREAM
-          << "," << certificate.effectiveDate()
-          << "," << certificate.expiryDate()
+          << ',' << certificate.effectiveDate()
+          << ',' << certificate.expiryDate()
 #endif
-          << ")";
+          << ')';
     return debug;
 }