[poppler] Branch 'poppler-0.10' - poppler/Decrypt.cc

[Albert Astals Cid]

 poppler/Decrypt.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c771e6afc86b5943954099956492433cca11911
Author: Matthias Franz <matthias at ktug.or.kr>
Date:   Sun Apr 19 23:29:18 2009 +0200

    Fix decryption using owner password on some pdf
    
    See bug #21270

diff --git a/poppler/Decrypt.cc b/poppler/Decrypt.cc
index 50f97bd..8719539 100644
--- a/poppler/Decrypt.cc
+++ b/poppler/Decrypt.cc
@@ -15,6 +15,7 @@
 //
 // Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
 // Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009 Matthias Franz <matthias at ktug.or.kr>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -75,7 +76,7 @@ GBool Decrypt::makeFileKey(int encVersion, int encRevision, int keyLength,
     md5(test, 32, test);
     if (encRevision == 3) {
       for (i = 0; i < 50; ++i) {
-	md5(test, 16, test);
+	md5(test, keyLength, test);
       }
     }
     if (encRevision == 2) {