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

SSL example: update secure socket client example to use new cert API

Browse Source 
issuerInfo and subjectInfo now return a QStringList instead of a QString

Change-Id: I04174a7f6319ae156ac8de964d04c0525c9c5a9a
Reviewed-on: http://codereview.qt.nokia.com/799
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
Peter Hartmann 2011-06-27 15:55:42 +02:00 committed by Qt by Nokia
parent 1cf971b99c
commit 9b46943686
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
examples/network/securesocketclient/certificateinfo.cpp
View File

@ -65,8 +65,8 @@ void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain)
for (int i = 0; i < chain.size(); ++i) { for (int i = 0; i < chain.size(); ++i) {
const QSslCertificate &cert = chain.at(i); const QSslCertificate &cert = chain.at(i);
form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: ")) form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: "))
.arg(cert.subjectInfo(QSslCertificate::Organization)) .arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
.arg(cert.subjectInfo(QSslCertificate::CommonName))); .arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" "))));
} }
form->certificationPathView->setCurrentIndex(0); form->certificationPathView->setCurrentIndex(0);
@ -78,19 +78,19 @@ void CertificateInfo::updateCertificateInfo(int index)
if (index >= 0 && index < chain.size()) { if (index >= 0 && index < chain.size()) {
const QSslCertificate &cert = chain.at(index); const QSslCertificate &cert = chain.at(index);
QStringList lines; QStringList lines;
lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization)) lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
<< tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName)) << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
<< tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName)) << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
<< tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName)) << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
<< tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName)) << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
<< tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName)) << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" ")))
<< QString() << QString()
<< tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization)) << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
<< tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName)) << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
<< tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName)) << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
<< tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName)) << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
<< tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName)) << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
<< tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName)); << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1String(" ")));
foreach (QString line, lines) foreach (QString line, lines)
form->certificateInfoView->addItem(line); form->certificateInfoView->addItem(line);
} else { } else {