commit 4234b099f1ced2c1929a98ef6133b5280697f00a
author Miklos Vajna <vmiklos@collabora.co.uk> Tue Nov 22 15:07:54 2016 +0100
committer Miklos Vajna <vmiklos@collabora.co.uk> Tue Nov 22 20:27:50 2016 +0100
tree f9c9e779c7524714f8ac467f63e8e0d80ffffcea
parent 1ed86ee4ebfa215a634e7a0d80b5f7fb479d893a

tdf#99327 vcl PDF mscrypto sign: fix SHA-256 OID

The previous OID only worked with NSS as NSS_CMSUtil_MapSignAlgs() has a
hack to accept it, saying Windows 2003 generates such OIDs. Don't depend
on readers of the signature accepting that incorrect OID.

Change-Id: I63e9a363e9e2ad233eeeacea1a354e3190da1ac1

vcl/source/gdi/pdfwriter_impl.cxx

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 496dd50..e5af4d4 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7306,7 +7306,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
    aPara.cbSize = sizeof(aPara);
    aPara.dwMsgEncodingType = PKCS_7_ASN_ENCODING | X509_ASN_ENCODING;
    aPara.pSigningCert = pCertContext;
    aPara.HashAlgorithm.pszObjId = const_cast<LPSTR>(szOID_RSA_SHA256RSA);
    aPara.HashAlgorithm.pszObjId = const_cast<LPSTR>(szOID_NIST_sha256);
    aPara.HashAlgorithm.Parameters.cbData = 0;
    aPara.cMsgCert = 1;
    aPara.rgpMsgCert = &pCertContext;
@@ -7335,7 +7335,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
    aSignerInfo.pCertInfo = pCertContext->pCertInfo;
    aSignerInfo.hCryptProv = hCryptProv;
    aSignerInfo.dwKeySpec = nKeySpec;
    aSignerInfo.HashAlgorithm.pszObjId = const_cast<LPSTR>(szOID_RSA_SHA256RSA);
    aSignerInfo.HashAlgorithm.pszObjId = const_cast<LPSTR>(szOID_NIST_sha256);
    aSignerInfo.HashAlgorithm.Parameters.cbData = 0;

    CMSG_SIGNED_ENCODE_INFO aSignedInfo;