diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 12:25:41 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-26 14:42:43 +0200 |
| commit | 0e6f6507d5920e2566f790007b97bda6441ec577 (patch) | |
| tree | 6b857694bbf1cce37dba4aec3f0267135cc480a4 /src/network/ssl/qsslkey_p.cpp | |
| parent | db61e43c81f4b5ed8c36365f63c2e2fb81e2a1e7 (diff) | |
Use QList instead of QVector in network
Task-number: QTBUG-84469
Change-Id: I7827da68e73ca8ff1e599c836f2157894c452b63
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslkey_p.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey_p.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/network/ssl/qsslkey_p.cpp b/src/network/ssl/qsslkey_p.cpp index b0d6c729f9..ce12f49989 100644 --- a/src/network/ssl/qsslkey_p.cpp +++ b/src/network/ssl/qsslkey_p.cpp @@ -271,27 +271,23 @@ QByteArray QSslKeyPrivate::derFromPem(const QByteArray &pem, QMap<QByteArray, QB bool QSslKeyPrivate::isEncryptedPkcs8(const QByteArray &der) const { - static const QVector<QByteArray> pbes1OIds { + static const QList<QByteArray> pbes1OIds { // PKCS5 - {PKCS5_MD2_DES_CBC_OID}, - {PKCS5_MD2_RC2_CBC_OID}, - {PKCS5_MD5_DES_CBC_OID}, - {PKCS5_MD5_RC2_CBC_OID}, - {PKCS5_SHA1_DES_CBC_OID}, - {PKCS5_SHA1_RC2_CBC_OID}, + { PKCS5_MD2_DES_CBC_OID }, { PKCS5_MD2_RC2_CBC_OID }, { PKCS5_MD5_DES_CBC_OID }, + { PKCS5_MD5_RC2_CBC_OID }, { PKCS5_SHA1_DES_CBC_OID }, { PKCS5_SHA1_RC2_CBC_OID }, }; QAsn1Element elem; if (!elem.read(der) || elem.type() != QAsn1Element::SequenceType) return false; - const QVector<QAsn1Element> items = elem.toVector(); + const auto items = elem.toList(); if (items.size() != 2 || items[0].type() != QAsn1Element::SequenceType || items[1].type() != QAsn1Element::OctetStringType) { return false; } - const QVector<QAsn1Element> encryptionSchemeContainer = items[0].toVector(); + const auto encryptionSchemeContainer = items[0].toList(); if (encryptionSchemeContainer.size() != 2 || encryptionSchemeContainer[0].type() != QAsn1Element::ObjectIdentifierType || encryptionSchemeContainer[1].type() != QAsn1Element::SequenceType) { |