qt5: Remove CertificateInfo()
This is BC because the version with it was never released
People will shoot themselves on the foot and we don't need it
diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
index 50425b8..ef13e58 100644
--- a/qt5/src/poppler-form.cc
+++ b/qt5/src/poppler-form.cc
@@ -1,6 +1,6 @@
/* poppler-form.h: qt interface to poppler
* Copyright (C) 2007-2008, 2011, Pino Toscano <pino@kde.org>
- * Copyright (C) 2008, 2011, 2012, 2015-2018 Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, 2011, 2012, 2015-2019 Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2011 Carlos Garcia Campos <carlosgc@gnome.org>
* Copyright (C) 2012, Adam Reichold <adamreichold@myopera.com>
* Copyright (C) 2016, Hanno Meyer-Thurow <h.mth@web.de>
@@ -523,11 +523,6 @@
bool is_null;
};
-CertificateInfo::CertificateInfo()
- : d_ptr( nullptr )
-{
-}
-
CertificateInfo::CertificateInfo(CertificateInfoPrivate* priv)
: d_ptr( priv )
{
@@ -681,6 +676,11 @@
class SignatureValidationInfoPrivate {
public:
+ SignatureValidationInfoPrivate(CertificateInfo &&ci)
+ : cert_info(ci)
+ {
+ }
+
SignatureValidationInfo::SignatureStatus signature_status;
SignatureValidationInfo::CertificateStatus certificate_status;
CertificateInfo cert_info;
@@ -869,7 +869,47 @@
FormWidgetSignature* fws = static_cast<FormWidgetSignature*>(m_formData->fm);
const time_t validationTimeT = validationTime.isValid() ? validationTime.toTime_t() : -1;
SignatureInfo* si = fws->validateSignature(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT);
- SignatureValidationInfoPrivate* priv = new SignatureValidationInfoPrivate;
+
+ // get certificate info
+ const X509CertificateInfo *ci = si->getCertificateInfo();
+ CertificateInfoPrivate* certPriv = new CertificateInfoPrivate;
+ certPriv->is_null = true;
+ if (ci)
+ {
+ certPriv->version = ci->getVersion();
+ certPriv->ku_extensions = ci->getKeyUsageExtensions();
+
+ const GooString &certSerial = ci->getSerialNumber();
+ certPriv->serial_number = QByteArray(certSerial.c_str(), certSerial.getLength());
+
+ const X509CertificateInfo::EntityInfo &issuerInfo = ci->getIssuerInfo();
+ certPriv->issuer_info.common_name = issuerInfo.commonName.c_str();
+ certPriv->issuer_info.distinguished_name = issuerInfo.distinguishedName.c_str();
+ certPriv->issuer_info.email_address = issuerInfo.email.c_str();
+ certPriv->issuer_info.org_name = issuerInfo.organization.c_str();
+
+ const X509CertificateInfo::EntityInfo &subjectInfo = ci->getSubjectInfo();
+ certPriv->subject_info.common_name = subjectInfo.commonName.c_str();
+ certPriv->subject_info.distinguished_name = subjectInfo.distinguishedName.c_str();
+ certPriv->subject_info.email_address = subjectInfo.email.c_str();
+ certPriv->subject_info.org_name = subjectInfo.organization.c_str();
+
+ X509CertificateInfo::Validity certValidity = ci->getValidity();
+ certPriv->validity_start = QDateTime::fromTime_t(certValidity.notBefore, Qt::UTC);
+ certPriv->validity_end = QDateTime::fromTime_t(certValidity.notAfter, Qt::UTC);
+
+ const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo();
+ certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength());
+ certPriv->public_key_type = static_cast<int>(pkInfo.publicKeyType);
+ certPriv->public_key_strength = pkInfo.publicKeyStrength;
+
+ const GooString &certDer = ci->getCertificateDER();
+ certPriv->certificate_der = QByteArray(certDer.c_str(), certDer.getLength());
+
+ certPriv->is_null = false;
+ }
+
+ SignatureValidationInfoPrivate* priv = new SignatureValidationInfoPrivate(CertificateInfo(certPriv));
switch (si->getSignatureValStatus()) {
case SIGNATURE_VALID:
priv->signature_status = SignatureValidationInfo::SignatureValid;
@@ -940,46 +980,6 @@
}
delete checkedSignature;
- // set certificate info
- const X509CertificateInfo *ci = si->getCertificateInfo();
- CertificateInfoPrivate* certPriv = new CertificateInfoPrivate;
- certPriv->is_null = true;
- if (ci)
- {
- certPriv->version = ci->getVersion();
- certPriv->ku_extensions = ci->getKeyUsageExtensions();
-
- const GooString &certSerial = ci->getSerialNumber();
- certPriv->serial_number = QByteArray(certSerial.c_str(), certSerial.getLength());
-
- const X509CertificateInfo::EntityInfo &issuerInfo = ci->getIssuerInfo();
- certPriv->issuer_info.common_name = issuerInfo.commonName.c_str();
- certPriv->issuer_info.distinguished_name = issuerInfo.distinguishedName.c_str();
- certPriv->issuer_info.email_address = issuerInfo.email.c_str();
- certPriv->issuer_info.org_name = issuerInfo.organization.c_str();
-
- const X509CertificateInfo::EntityInfo &subjectInfo = ci->getSubjectInfo();
- certPriv->subject_info.common_name = subjectInfo.commonName.c_str();
- certPriv->subject_info.distinguished_name = subjectInfo.distinguishedName.c_str();
- certPriv->subject_info.email_address = subjectInfo.email.c_str();
- certPriv->subject_info.org_name = subjectInfo.organization.c_str();
-
- X509CertificateInfo::Validity certValidity = ci->getValidity();
- certPriv->validity_start = QDateTime::fromTime_t(certValidity.notBefore, Qt::UTC);
- certPriv->validity_end = QDateTime::fromTime_t(certValidity.notAfter, Qt::UTC);
-
- const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo();
- certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength());
- certPriv->public_key_type = static_cast<int>(pkInfo.publicKeyType);
- certPriv->public_key_strength = pkInfo.publicKeyStrength;
-
- const GooString &certDer = ci->getCertificateDER();
- certPriv->certificate_der = QByteArray(certDer.c_str(), certDer.getLength());
-
- certPriv->is_null = false;
- }
- priv->cert_info = CertificateInfo(certPriv);
-
return SignatureValidationInfo(priv);
}
diff --git a/qt5/src/poppler-form.h b/qt5/src/poppler-form.h
index 2c97383..a102762 100644
--- a/qt5/src/poppler-form.h
+++ b/qt5/src/poppler-form.h
@@ -1,6 +1,6 @@
/* poppler-form.h: qt interface to poppler
* Copyright (C) 2007-2008, Pino Toscano <pino@kde.org>
- * Copyright (C) 2008, 2011, 2016, 2017, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, 2011, 2016, 2017, 2019, Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2012, Adam Reichold <adamreichold@myopera.com>
* Copyright (C) 2016, Hanno Meyer-Thurow <h.mth@web.de>
* Copyright (C) 2017, Hans-Ulrich Jüttner <huj@froreich-bioscientia.de>
@@ -452,7 +452,6 @@
Organization,
};
- CertificateInfo();
CertificateInfo(CertificateInfoPrivate *priv);
~CertificateInfo();
