diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-09 07:06:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-09 07:06:52 +0000 |
| commit | 5bfac9d653357c906946563b9494d7ae69cdad92 (patch) | |
| tree | 0cc119af894a398497eba6f56fe2f224f6947616 /src/network/ssl/qsslcertificate_qt.cpp | |
| parent | f08e1ecdc88e9373a31c1505d5db7f905431c644 (diff) | |
| parent | 77da617dc8e378a631ee8c15b1b414f16b87f147 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/ssl/qsslcertificate_qt.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate_qt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp index 2d1dd68198..a283078998 100644 --- a/src/network/ssl/qsslcertificate_qt.cpp +++ b/src/network/ssl/qsslcertificate_qt.cpp @@ -366,8 +366,10 @@ bool QSslCertificatePrivate::parse(const QByteArray &data) const QByteArray oid = elem.toObjectId(); if (oid == RSA_ENCRYPTION_OID) publicKeyAlgorithm = QSsl::Rsa; - else if (oid == RSA_ENCRYPTION_OID) + else if (oid == DSA_ENCRYPTION_OID) publicKeyAlgorithm = QSsl::Dsa; + else if (oid == EC_ENCRYPTION_OID) + publicKeyAlgorithm = QSsl::Ec; else publicKeyAlgorithm = QSsl::Opaque; |