@@ -76,9 +76,12 @@ CardCertificateAndPinInfo CertificateWidgetInfo::certificateInfo() const
76
76
return certAndPinInfo;
77
77
}
78
78
79
- std::tuple<QString, QString, QString> CertificateWidgetInfo::certData () const
79
+ std::tuple<QString, QString, QString, QString > CertificateWidgetInfo::certData () const
80
80
{
81
- return {certAndPinInfo.certificate .issuerInfo (QSslCertificate::CommonName).join (' ' ),
81
+ return {certAndPinInfo.certInfo .subject .toHtmlEscaped (),
82
+ certAndPinInfo.certificate .issuerInfo (QSslCertificate::CommonName)
83
+ .join (' ' )
84
+ .toHtmlEscaped (),
82
85
certAndPinInfo.certificate .effectiveDate ().date ().toString (Qt::ISODate),
83
86
certAndPinInfo.certificate .expiryDate ().date ().toString (Qt::ISODate)};
84
87
}
@@ -101,7 +104,7 @@ void CertificateWidgetInfo::setCertificateInfo(const CardCertificateAndPinInfo&
101
104
certAndPinInfo = cardCertPinInfo;
102
105
const auto & certInfo = cardCertPinInfo.certInfo ;
103
106
QString warning;
104
- auto [issuer, effectiveDate, expiryDate] = certData ();
107
+ auto [subject, issuer, effectiveDate, expiryDate] = certData ();
105
108
if (certInfo.notEffective ) {
106
109
effectiveDate = displayInRed (effectiveDate);
107
110
warning = displayInRed (CertificateWidget::tr (" (Not effective)" ));
@@ -111,7 +114,7 @@ void CertificateWidgetInfo::setCertificateInfo(const CardCertificateAndPinInfo&
111
114
warning = displayInRed (CertificateWidget::tr (" (Expired)" ));
112
115
}
113
116
info->setText (CertificateWidget::tr (" <b>%1</b><br />Issuer: %2<br />Valid: %3 to %4%5" )
114
- .arg (certInfo. subject , issuer, effectiveDate, expiryDate, warning));
117
+ .arg (subject, issuer, effectiveDate, expiryDate, warning));
115
118
info->parentWidget ()->setDisabled (certInfo.notEffective || certInfo.isExpired
116
119
|| cardCertPinInfo.pinInfo .pinIsBlocked );
117
120
if (warning.isEmpty () && cardCertPinInfo.pinInfo .pinIsBlocked ) {
@@ -171,10 +174,8 @@ bool CertificateButton::eventFilter(QObject* object, QEvent* event)
171
174
void CertificateButton::setCertificateInfo (const CardCertificateAndPinInfo& cardCertPinInfo)
172
175
{
173
176
CertificateWidgetInfo::setCertificateInfo (cardCertPinInfo);
174
- const auto & certInfo = cardCertPinInfo.certInfo ;
175
- auto [issuer, effectiveDate, expiryDate] = certData ();
176
- setText (tr (" %1 Issuer: %2 Valid: %3 to %4" )
177
- .arg (certInfo.subject , issuer, effectiveDate, expiryDate));
177
+ auto [subject, issuer, effectiveDate, expiryDate] = certData ();
178
+ setText (tr (" %1 Issuer: %2 Valid: %3 to %4" ).arg (subject, issuer, effectiveDate, expiryDate));
178
179
}
179
180
180
181
void CertificateButton::paintEvent (QPaintEvent* /* event*/ )
0 commit comments