diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-03-25 20:59:08 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-03-26 09:25:55 +0100 |
| commit | a3eefc0fbe7d9a9ed946979c97a41181cd043593 (patch) | |
| tree | c218bede10b4accd9102cad5ac07bc50c0d5c67a /external | |
| parent | 74299624ec810f9683326608ad398211cf51787b (diff) | |
poppler: upgrade to release 24.03.0
Change-Id: Icd063dcc9a034e88283ddf16be64091a32f3453f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165292
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/disable-nss-and-gpgmepp.patch.1 | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 b/external/poppler/disable-nss-and-gpgmepp.patch.1 index 01b442f53a1c..1d7f7f933433 100644 --- a/external/poppler/disable-nss-and-gpgmepp.patch.1 +++ b/external/poppler/disable-nss-and-gpgmepp.patch.1 @@ -11,7 +11,7 @@ disable NSS/GPGMEPP dependent code. #include "SignatureInfo.h" #include "CertificateInfo.h" #include "XRef.h" -@@ -577,7 +577,7 @@ +@@ -578,7 +578,7 @@ { return static_cast<FormFieldSignature *>(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, ocspRevocationCheck, enableAIA); } @@ -20,12 +20,12 @@ disable NSS/GPGMEPP dependent code. // update hash with the specified range of data from the file static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler, Goffset start, Goffset end) { -@@ -607,10 +607,12 @@ +@@ -608,10 +608,12 @@ delete[] buf; return true; } +#endif - + bool FormWidgetSignature::signDocument(const std::string &saveFilename, const std::string &certNickname, const std::string &password, const GooString *reason, const GooString *location, const std::optional<GooString> &ownerPassword, const std::optional<GooString> &userPassword) { @@ -33,44 +33,46 @@ disable NSS/GPGMEPP dependent code. auto backend = CryptoSign::Factory::createActive(); if (!backend) { return false; -@@ -698,6 +700,8 @@ +@@ -697,8 +699,8 @@ + signatureField->setSignature(*signature); + fclose(file); - - return true; +- +- return true; +#endif + return false; } - - bool FormWidgetSignature::signDocumentWithAppearance(const std::string &saveFilename, const std::string &certNickname, const std::string &password, const GooString *reason, const GooString *location, -@@ -2316,6 +2320,7 @@ - + + static std::tuple<double, double> calculateDxDy(int rot, const PDFRectangle *rect) +@@ -2355,6 +2357,7 @@ + void FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface *handler, Goffset block_len) { +#if 0 if (!handler) { return; } -@@ -2335,6 +2340,7 @@ +@@ -2374,6 +2377,7 @@ i += BLOCK_SIZE; } } +#endif } - + FormSignatureType FormWidgetSignature::signatureType() const -@@ -2349,6 +2355,7 @@ - +@@ -2388,6 +2392,7 @@ + SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA) { +#if 0 auto backend = CryptoSign::Factory::createActive(); if (!backend) { return signature_info; -@@ -2425,6 +2432,7 @@ +@@ -2464,6 +2469,7 @@ const CertificateValidationStatus cert_val_state = signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime), ocspRevocationCheck, enableAIA); signature_info->setCertificateValStatus(cert_val_state); - + +#endif return signature_info; } - + |