diff options
Diffstat (limited to 'src/network/ssl/qsslcertificate_p.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate_p.h | 70 |
1 files changed, 48 insertions, 22 deletions
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index 6cf6974543..f47f4effde 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -1,47 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QSSLCERTIFICATE_P_H -#define QSSLCERTIFICATE_P_H +#ifndef QSSLCERTIFICATE_OPENSSL_P_H +#define QSSLCERTIFICATE_OPENSSL_P_H #include "qsslcertificate.h" @@ -61,10 +53,23 @@ #include <QtCore/qdatetime.h> #include <QtCore/qmap.h> +#ifndef QT_NO_OPENSSL #include <openssl/x509.h> +#else +struct X509; +struct X509_EXTENSION; +struct ASN1_OBJECT; +#endif + +#ifdef Q_OS_WINRT +#include <wrl.h> +#include <windows.security.cryptography.certificates.h> +#endif QT_BEGIN_NAMESPACE +// forward declaration + class QSslCertificatePrivate { public: @@ -76,8 +81,10 @@ public: ~QSslCertificatePrivate() { +#ifndef QT_NO_OPENSSL if (x509) q_X509_free(x509); +#endif } bool null; @@ -89,6 +96,18 @@ public: QDateTime notValidAfter; QDateTime notValidBefore; +#ifdef QT_NO_OPENSSL + bool subjectMatchesIssuer; + QSsl::KeyAlgorithm publicKeyAlgorithm; + QByteArray publicKeyDerData; + QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames; + QList<QSslCertificateExtension> extensions; + + QByteArray derData; + + bool parse(const QByteArray &data); + bool parseExtension(const QByteArray &data, QSslCertificateExtension *extension); +#endif X509 *x509; void init(const QByteArray &data, QSsl::EncodingFormat format); @@ -102,12 +121,19 @@ public: static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1); static bool isBlacklisted(const QSslCertificate &certificate); static QSslCertificateExtension convertExtension(X509_EXTENSION *ext); + static QByteArray subjectInfoToString(QSslCertificate::SubjectInfo info); friend class QSslSocketBackendPrivate; QAtomicInt ref; + +#ifdef Q_OS_WINRT + Microsoft::WRL::ComPtr<ABI::Windows::Security::Cryptography::Certificates::ICertificate> certificate; + + static QSslCertificate QSslCertificate_from_Certificate(ABI::Windows::Security::Cryptography::Certificates::ICertificate *iCertificate); +#endif }; QT_END_NAMESPACE -#endif +#endif // QSSLCERTIFICATE_OPENSSL_P_H |