AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSslCertificate: rename "tag" to "attribute", as in the RFC

Browse Source 
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>
This commit is contained in:
Peter Hartmann 2011-07-11 16:39:14 +02:00 committed by Qt by Nokia
parent fe9cb4a508
commit 94e110ca5f
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/network/ssl/qsslcertificate.cpp
View File

@ -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)

8
src/network/ssl/qsslcertificate.h
View File

@ -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;

14
tests/auto/qsslcertificate/tst_qsslcertificate.cpp
View File

@ -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