From 94e110ca5f70f61bb7f6a99be121e5d78670a22a Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Mon, 11 Jul 2011 16:39:14 +0200
Subject: 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>
---
 src/network/ssl/qsslcertificate.cpp | 28 ++++++++++++++--------------
 src/network/ssl/qsslcertificate.h   |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/network/ssl')

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;
-- 
cgit v1.2.3