From 2a66c02553bbcfbb9e646c39ec291fb2eefbf6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 29 Jul 2016 09:57:19 +0100 Subject: [PATCH] Resolves: tdf#84121 wrong password passed to xpdfimport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit regression from... commit eb276d11a652601f743d69ada7a38016bd97d73e Author: Fridrich Štrba Date: Mon Jul 8 14:01:17 2013 +0200 fdo#38878: Upgrading internal xpdf -> poppler before this the hashed _OOO_pdfi_Credentials_ was used in the removed OOoImportSecurityhandler::authorize but after this the hashed password continued to be passed through stdin, while the unhashed password was the required data. Change-Id: Iadc8a372abcfab514f724dd95f05776e5153d007 --- sdext/source/pdfimport/wrapper/wrapper.cxx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 4db5b3149ba1..e15ba172ad12 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -961,13 +961,6 @@ static bool checkEncryption( const OUString& i_rPa OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); bSuccess = bAuthenticated; } - if( bAuthenticated ) - { - OUStringBuffer aBuf( 128 ); - aBuf.append( "_OOO_pdfi_Credentials_" ); - aBuf.append( pPDFFile->getDecryptionKey() ); - io_rPwd = aBuf.makeStringAndClear(); - } } else if( i_xIHdl.is() ) {