diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 20:35:56 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 23:33:29 +0200 |
| commit | a68703b07e928be0eeb909c0e777e13e88cbf86d (patch) | |
| tree | d63d53a9facc83d72cb82f400d1ae8cce6a2115f /libqpdf/QPDF_encryption.cc | |
| parent | ae819b5318bf0a0a21b80d6269ef73ed8123d5d6 (diff) | |
| download | qpdf-a68703b07e928be0eeb909c0e777e13e88cbf86d.tar.zst | |
Replace PointerHolder with std::shared_ptr in library sources only
(patrepl and cleanpatch are my own utilities)
patrepl s/PointerHolder/std::shared_ptr/g {include,libqpdf}/qpdf/*.hh
patrepl s/PointerHolder/std::shared_ptr/g libqpdf/*.cc
patrepl s/make_pointer_holder/std::make_shared/g libqpdf/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g libqpdf/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
cleanpatch
./format-code
Diffstat (limited to 'libqpdf/QPDF_encryption.cc')
| -rw-r--r-- | libqpdf/QPDF_encryption.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc index 86e2a906..8166fc0d 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -754,7 +754,8 @@ QPDF::recover_encryption_key_with_password( } QPDF::encryption_method_e -QPDF::interpretCF(PointerHolder<EncryptionParameters> encp, QPDFObjectHandle cf) +QPDF::interpretCF( + std::shared_ptr<EncryptionParameters> encp, QPDFObjectHandle cf) { if (cf.isName()) { std::string filter = cf.getName(); @@ -1079,7 +1080,7 @@ QPDF::initializeEncryption() std::string QPDF::getKeyForObject( - PointerHolder<EncryptionParameters> encp, + std::shared_ptr<EncryptionParameters> encp, int objid, int generation, bool use_aes) @@ -1165,7 +1166,7 @@ QPDF::decryptString(std::string& str, int objid, int generation) } else { QTC::TC("qpdf", "QPDF_encryption rc4 decode string"); size_t vlen = str.length(); - // Using PointerHolder guarantees that tmp will + // Using std::shared_ptr guarantees that tmp will // be freed even if rc4.process throws an exception. auto tmp = QUtil::make_unique_cstr(str); RC4 rc4(QUtil::unsigned_char_pointer(key), toI(key.length())); @@ -1188,8 +1189,8 @@ QPDF::decryptString(std::string& str, int objid, int generation) void QPDF::decryptStream( - PointerHolder<EncryptionParameters> encp, - PointerHolder<InputSource> file, + std::shared_ptr<EncryptionParameters> encp, + std::shared_ptr<InputSource> file, QPDF& qpdf_for_warning, Pipeline*& pipeline, int objid, |