diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2009-10-17 20:54:51 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2009-10-17 20:54:51 +0200 |
| commit | c13bc66de8d6ef553c4ed05247774476a859a5f3 (patch) | |
| tree | de0daed86869f322c921f281fa7c6a5337738a81 /libqpdf/QPDF.cc | |
| parent | 27e8d4bbfffef1072043ef21725ab85eabaee63b (diff) | |
| download | qpdf-c13bc66de8d6ef553c4ed05247774476a859a5f3.tar.zst | |
checkpoint -- partially implemented /V=4 encryption
git-svn-id: svn+q:///qpdf/trunk@811 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'libqpdf/QPDF.cc')
| -rw-r--r-- | libqpdf/QPDF.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index dd1fea56..10777aa4 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -253,7 +253,8 @@ QPDF::QPDF() : ignore_xref_streams(false), suppress_warnings(false), attempt_recovery(true), - encryption_use_aes(false), + encryption_V(0), + encrypt_metadata(true), cached_key_objid(0), cached_key_generation(0), first_xref_item_offset(0), @@ -1813,17 +1814,7 @@ QPDF::pipeStreamData(int objid, int generation, std::vector<PointerHolder<Pipeline> > to_delete; if (this->encrypted) { - bool xref_stream = false; - if (stream_dict.getKey("/Type").isName() && - (stream_dict.getKey("/Type").getName() == "/XRef")) - { - QTC::TC("qpdf", "QPDF piping xref stream from encrypted file"); - xref_stream = true; - } - if (! xref_stream) - { - decryptStream(pipeline, objid, generation, to_delete); - } + decryptStream(pipeline, objid, generation, stream_dict, to_delete); } try |