diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-10-26 19:36:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-10-27 09:38:37 +0200 |
| commit | 19e998aa98d966cffca98bed9408d5758d91d9be (patch) | |
| tree | ca847e1e091a456adb0cdddca471bcb5e7162504 /xmlsecurity/source/xmlsec/nss | |
| parent | dc85be45c7e2efc0512e823d08e2edba0d4c0e76 (diff) | |
Update libxmlsec to 1.2.35
- backport 2 patches to fix the build
- replace calls to the now deprecated xmlSecBase64Decode()
Change-Id: Ib3254002fff5e49bb6dd4eb1bf62e7d2ee7be83e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141865
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f6c35257f80f..97f2ce3b4ea7 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -474,7 +474,8 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAsci { OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; xmlChar* chCert = xmlStrndup( reinterpret_cast<const xmlChar*>(oscert.getStr()), static_cast<int>(oscert.getLength()) ) ; - int certSize = xmlSecBase64Decode( chCert, reinterpret_cast<xmlSecByte*>(chCert), xmlStrlen( chCert ) ) ; + xmlSecSize certSize; + xmlSecBase64Decode_ex( chCert, reinterpret_cast<xmlSecByte*>(chCert), xmlStrlen( chCert ), &certSize ) ; if (certSize == 0) return nullptr; |