From 25ebe8a3803d260671dac7225aaecd25be88bc4e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 29 Jul 2016 09:57:19 +0100 Subject: 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 (cherry picked from commit 2a66c02553bbcfbb9e646c39ec291fb2eefbf6bb) Reviewed-on: https://gerrit.libreoffice.org/27673 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sdext/source/pdfimport/wrapper/wrapper.cxx | 7 ------- 1 file changed, 7 deletions(-) (limited to 'sdext') diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 48e3924ef90d..b45412dac12e 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -959,13 +959,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() ) { -- cgit v1.2.3