diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-07-11 16:39:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 09:25:06 +0200 |
| commit | 94e110ca5f70f61bb7f6a99be121e5d78670a22a (patch) | |
| tree | d7e80821af76fd671ee967dbdd2a09b47d5b9acb /tests | |
| parent | fe9cb4a5088a5aa760df02bbe8d6c7e06e28b073 (diff) | |
QSslCertificate: rename "tag" to "attribute", as in the RFC
RFC 2459 "Internet X.509 Public Key Infrastructure" uses the word
"attribute" for fields in a certificate like common name, organization
etc.
Change-Id: I51e595acbe3e146acf81af21cf48e554fa9490e4
Reviewed-on: http://codereview.qt.nokia.com/1453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp index c04f315060..f12af0275c 100644 --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp @@ -115,7 +115,7 @@ private slots: void blacklistedCertificates(); void toText(); void multipleCommonNames(); - void subjectAndIssuerTags(); + void subjectAndIssuerAttributes(); // ### add tests for certificate bundles (multiple certificates concatenated into a single // structure); both PEM and DER formatted @@ -884,21 +884,21 @@ void tst_QSslCertificate::multipleCommonNames() QVERIFY(commonNames.contains(QString("www2.example.com"))); } -void tst_QSslCertificate::subjectAndIssuerTags() +void tst_QSslCertificate::subjectAndIssuerAttributes() { QList<QSslCertificate> certList = QSslCertificate::fromPath(SRCDIR "more-certificates/test-cn-with-drink-cert.pem"); QVERIFY2(certList.count() > 0, "Please run this test from the source directory"); - QList<QByteArray> tags = certList[0].subjectInfoTags(); - QVERIFY(tags.contains(QByteArray("favouriteDrink"))); - tags.clear(); + QList<QByteArray> attributes = certList[0].subjectInfoAttributes(); + QVERIFY(attributes.contains(QByteArray("favouriteDrink"))); + attributes.clear(); certList = QSslCertificate::fromPath(SRCDIR "more-certificates/natwest-banking.pem"); QVERIFY2(certList.count() > 0, "Please run this test from the source directory"); - tags = certList[0].subjectInfoTags(); - QVERIFY(tags.contains(QByteArray("1.3.6.1.4.1.311.60.2.1.3"))); + attributes = certList[0].subjectInfoAttributes(); + QVERIFY(attributes.contains(QByteArray("1.3.6.1.4.1.311.60.2.1.3"))); } #endif // QT_NO_OPENSSL |