diff options
author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-03 11:41:22 +0200 |
---|---|---|
committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-05 14:20:44 +0200 |
commit | 070fcf9ce1ef3c2912bd15f1f39db9740cc754c6 (patch) | |
tree | 3447d1878ad60d451f247f2cbb18964dc0000cc9 /src/network/ssl/qsslcertificate_p.h | |
parent | 2e667c9171f141c6ee0a279aae4479d4414c99f3 (diff) |
ssl: common certificate parser support for extensions
This makes non-OpenSSL backends able to handle to certificate
extensions.
This also converts the Q_OS_WINRT #ifdef's in the unit test to
QT_NO_OPENSSL as the behavior is the same for any non-OpenSSL
backend.
Change-Id: I6a8306dc5c97a659ec96063d5a59cee2ee9a63a9
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslcertificate_p.h')
-rw-r--r-- | src/network/ssl/qsslcertificate_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index 472553c30c..b0c99e545d 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -109,13 +109,16 @@ public: 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); - bool parse(const QByteArray &data); static QByteArray asn1ObjectId(ASN1_OBJECT *object); static QByteArray asn1ObjectName(ASN1_OBJECT *object); |