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 | |
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>
-rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 28 | ||||
-rw-r--r-- | src/network/ssl/qsslcertificate.h | 8 | ||||
-rw-r--r-- | tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 14 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 06a2071161..839a253b99 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -334,20 +334,20 @@ QStringList QSslCertificate::issuerInfo(SubjectInfo info) const } /*! - Returns the issuer information for \a tag from the certificate, - or an empty string if there is no information for \a tag in the + Returns the issuer information for \a attribute from the certificate, + or an empty string if there is no information for \a attribute in the certificate. \sa subjectInfo() */ -QStringList QSslCertificate::issuerInfo(const QByteArray &tag) const +QStringList QSslCertificate::issuerInfo(const QByteArray &attribute) const { // lazy init if (d->issuerInfo.isEmpty() && d->x509) d->issuerInfo = _q_mapFromX509Name(q_X509_get_issuer_name(d->x509)); - return d->issuerInfo.values(tag); + return d->issuerInfo.values(attribute); } /*! @@ -370,31 +370,31 @@ QStringList QSslCertificate::subjectInfo(SubjectInfo info) const } /*! - Returns the subject information for \a tag, or an empty string if - there is no information for \a tag in the certificate. + Returns the subject information for \a attribute, or an empty string if + there is no information for \a attribute in the certificate. \sa issuerInfo() */ -QStringList QSslCertificate::subjectInfo(const QByteArray &tag) const +QStringList QSslCertificate::subjectInfo(const QByteArray &attribute) const { // lazy init if (d->subjectInfo.isEmpty() && d->x509) d->subjectInfo = _q_mapFromX509Name(q_X509_get_subject_name(d->x509)); - return d->subjectInfo.values(tag); + return d->subjectInfo.values(attribute); } /*! - Returns a list of the tags that have values in the subject + Returns a list of the attributes that have values in the subject information of this certificate. The information associated - with a given tag can be accessed using the subjectInfo() + with a given attribute can be accessed using the subjectInfo() method. Note that this list may include the OIDs for any elements that are not known by the SSL backend. \sa subjectInfo() */ -QList<QByteArray> QSslCertificate::subjectInfoTags() const +QList<QByteArray> QSslCertificate::subjectInfoAttributes() const { // lazy init if (d->subjectInfo.isEmpty() && d->x509) @@ -405,15 +405,15 @@ QList<QByteArray> QSslCertificate::subjectInfoTags() const } /*! - Returns a list of the tags that have values in the issuer + Returns a list of the attributes that have values in the issuer information of this certificate. The information associated - with a given tag can be accessed using the issuerInfo() + with a given attribute can be accessed using the issuerInfo() method. Note that this list may include the OIDs for any elements that are not known by the SSL backend. \sa subjectInfo() */ -QList<QByteArray> QSslCertificate::issuerInfoTags() const +QList<QByteArray> QSslCertificate::issuerInfoAttributes() const { // lazy init if (d->issuerInfo.isEmpty() && d->x509) diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index b038a6ab88..4de84dd4ba 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -100,11 +100,11 @@ public: QByteArray serialNumber() const; QByteArray digest(QCryptographicHash::Algorithm algorithm = QCryptographicHash::Md5) const; QStringList issuerInfo(SubjectInfo info) const; - QStringList issuerInfo(const QByteArray &tag) const; + QStringList issuerInfo(const QByteArray &attribute) const; QStringList subjectInfo(SubjectInfo info) const; - QStringList subjectInfo(const QByteArray &tag) const; - QList<QByteArray> subjectInfoTags() const; - QList<QByteArray> issuerInfoTags() const; + QStringList subjectInfo(const QByteArray &attribute) const; + QList<QByteArray> subjectInfoAttributes() const; + QList<QByteArray> issuerInfoAttributes() const; QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const; QDateTime effectiveDate() const; QDateTime expiryDate() const; 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 |