diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2021-02-06 22:25:10 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2021-02-06 23:08:41 +0100 |
| commit | e076c9bf084ba5f90f52d829255e4ef04e3a8031 (patch) | |
| tree | 2e2fb760c89cf04dd7eda0d2c5044f46925c6fc1 /include | |
| parent | ac2b3b96e163c6ef98b708c6392a7e51538dd1cf (diff) | |
| download | qpdf-e076c9bf084ba5f90f52d829255e4ef04e3a8031.tar.zst | |
Remove erroneous handling of /EFF for stream decryption
I thought /EFF was supposed to be used as a default for decrypting
embedded file streams, but actually it's supposed to be advice to a
conforming writer about handling new ones. This makes sense since the
findAttachmentStreams code, which is not actually needed, was never
right.
Diffstat (limited to 'include')
| -rw-r--r-- | include/qpdf/QPDF.hh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 4e0984a7..4490189d 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -814,7 +814,6 @@ class QPDF int foreign_generation, qpdf_offset_t offset, size_t length, - bool is_attachment_stream, QPDFObjectHandle local_dict); private: @@ -824,7 +823,6 @@ class QPDF int foreign_generation; qpdf_offset_t offset; size_t length; - bool is_attachment_stream; QPDFObjectHandle local_dict; }; @@ -919,7 +917,6 @@ class QPDF int& act_objid, int& act_generation); PointerHolder<QPDFObject> resolve(int objid, int generation); void resolveObjectsInStream(int obj_stream_number); - void findAttachmentStreams(); void stopOnError(std::string const& message); // Calls finish() on the pipeline when done but does not delete it @@ -938,7 +935,6 @@ class QPDF int objid, int generation, qpdf_offset_t offset, size_t length, QPDFObjectHandle dict, - bool is_attachment_stream, Pipeline* pipeline, bool suppress_warnings, bool will_retry); @@ -1001,7 +997,7 @@ class QPDF PointerHolder<InputSource> file, QPDF& qpdf_for_warning, Pipeline*& pipeline, int objid, int generation, - QPDFObjectHandle& stream_dict, bool is_attachment_stream, + QPDFObjectHandle& stream_dict, std::vector<PointerHolder<Pipeline> >& heap); // Methods to support object copying @@ -1422,7 +1418,6 @@ class QPDF PointerHolder<QPDFObjectHandle::StreamDataProvider> copied_streams; // copied_stream_data_provider is owned by copied_streams CopiedStreamDataProvider* copied_stream_data_provider; - std::set<QPDFObjGen> attachment_streams; bool reconstructed_xref; bool fixed_dangling_refs; bool immediate_copy_from; |