diff options
| author | Albert Astals Cid <aacid@kde.org> | 2012-02-05 23:08:44 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2012-02-05 23:08:44 +0100 |
| commit | 548648bf29dc1551443eb1925814342e7aadee46 (patch) | |
| tree | 1ba5558dfbe0addfe978d305cee1d3782859edce | |
| parent | 6ee907f291427b8751a872b31210bf32e8d2b722 (diff) | |
[xpdf303] Merge PDFDoc encryption related code
| -rw-r--r-- | poppler/PDFDoc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc index 608b3abf..30e133a2 100644 --- a/poppler/PDFDoc.cc +++ b/poppler/PDFDoc.cc @@ -419,7 +419,10 @@ GBool PDFDoc::checkEncryption(GooString *ownerPassword, GooString *userPassword) xref->getTrailerDict()->dictLookup("Encrypt", &encrypt); if ((encrypted = encrypt.isDict())) { if ((secHdlr = SecurityHandler::make(this, &encrypt))) { - if (secHdlr->checkEncryption(ownerPassword, userPassword)) { + if (secHdlr->isUnencrypted()) { + // no encryption + ret = gTrue; + } else if (secHdlr->checkEncryption(ownerPassword, userPassword)) { // authorization succeeded xref->setEncryption(secHdlr->getPermissionFlags(), secHdlr->getOwnerPasswordOk(), |