diff options
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/QPDFJob.cc | 15 | ||||
-rw-r--r-- | libqpdf/QPDFWriter.cc | 6 | ||||
-rw-r--r-- | libqpdf/qpdf-c.cc | 18 |
3 files changed, 21 insertions, 18 deletions
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 2459394f..765e0281 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -2815,19 +2815,22 @@ QPDFJob::setEncryptionOptions(QPDF& pdf, QPDFWriter& w) QTC::TC("qpdf", "QPDFJob weak crypto error"); *(this->m->cerr) << this->m->message_prefix - << ": refusing to write a file with RC4, a weak cryptographic algorithm" + << ": refusing to write a file with RC4, a weak cryptographic " + "algorithm" << std::endl << "Please use 256-bit keys for better security." << std::endl << "Pass --allow-weak-crypto to enable writing insecure files." << std::endl - << "See also https://qpdf.readthedocs.io/en/stable/weak-crypto.html" + << "See also " + "https://qpdf.readthedocs.io/en/stable/weak-crypto.html" << std::endl; - throw std::runtime_error("refusing to write a file with weak crypto"); + throw std::runtime_error( + "refusing to write a file with weak crypto"); } } switch (R) { case 2: - w.setR2EncryptionParameters( + w.setR2EncryptionParametersInsecure( m->user_password.c_str(), m->owner_password.c_str(), m->r2_print, @@ -2836,7 +2839,7 @@ QPDFJob::setEncryptionOptions(QPDF& pdf, QPDFWriter& w) m->r2_annotate); break; case 3: - w.setR3EncryptionParameters( + w.setR3EncryptionParametersInsecure( m->user_password.c_str(), m->owner_password.c_str(), m->r3_accessibility, @@ -2848,7 +2851,7 @@ QPDFJob::setEncryptionOptions(QPDF& pdf, QPDFWriter& w) m->r3_print); break; case 4: - w.setR4EncryptionParameters( + w.setR4EncryptionParametersInsecure( m->user_password.c_str(), m->owner_password.c_str(), m->r3_accessibility, diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index 2b3e0207..0b7e7c42 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -365,7 +365,7 @@ QPDFWriter::setPCLm(bool val) } void -QPDFWriter::setR2EncryptionParameters( +QPDFWriter::setR2EncryptionParametersInsecure( char const* user_password, char const* owner_password, bool allow_print, @@ -391,7 +391,7 @@ QPDFWriter::setR2EncryptionParameters( } void -QPDFWriter::setR3EncryptionParameters( +QPDFWriter::setR3EncryptionParametersInsecure( char const* user_password, char const* owner_password, bool allow_accessibility, @@ -419,7 +419,7 @@ QPDFWriter::setR3EncryptionParameters( } void -QPDFWriter::setR4EncryptionParameters( +QPDFWriter::setR4EncryptionParametersInsecure( char const* user_password, char const* owner_password, bool allow_accessibility, diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc index e4ec6a61..8a940e3c 100644 --- a/libqpdf/qpdf-c.cc +++ b/libqpdf/qpdf-c.cc @@ -674,7 +674,7 @@ qpdf_set_preserve_encryption(qpdf_data qpdf, QPDF_BOOL value) } void -qpdf_set_r2_encryption_parameters( +qpdf_set_r2_encryption_parameters_insecure( qpdf_data qpdf, char const* user_password, char const* owner_password, @@ -683,8 +683,8 @@ qpdf_set_r2_encryption_parameters( QPDF_BOOL allow_extract, QPDF_BOOL allow_annotate) { - QTC::TC("qpdf", "qpdf-c called qpdf_set_r2_encryption_parameters"); - qpdf->qpdf_writer->setR2EncryptionParameters( + QTC::TC("qpdf", "qpdf-c called qpdf_set_r2_encryption_parameters_insecure"); + qpdf->qpdf_writer->setR2EncryptionParametersInsecure( user_password, owner_password, allow_print != QPDF_FALSE, @@ -694,7 +694,7 @@ qpdf_set_r2_encryption_parameters( } void -qpdf_set_r3_encryption_parameters2( +qpdf_set_r3_encryption_parameters_insecure( qpdf_data qpdf, char const* user_password, char const* owner_password, @@ -706,8 +706,8 @@ qpdf_set_r3_encryption_parameters2( QPDF_BOOL allow_modify_other, enum qpdf_r3_print_e print) { - QTC::TC("qpdf", "qpdf-c called qpdf_set_r3_encryption_parameters"); - qpdf->qpdf_writer->setR3EncryptionParameters( + QTC::TC("qpdf", "qpdf-c called qpdf_set_r3_encryption_parameters_insecure"); + qpdf->qpdf_writer->setR3EncryptionParametersInsecure( user_password, owner_password, allow_accessibility != QPDF_FALSE, @@ -720,7 +720,7 @@ qpdf_set_r3_encryption_parameters2( } void -qpdf_set_r4_encryption_parameters2( +qpdf_set_r4_encryption_parameters_insecure( qpdf_data qpdf, char const* user_password, char const* owner_password, @@ -734,8 +734,8 @@ qpdf_set_r4_encryption_parameters2( QPDF_BOOL encrypt_metadata, QPDF_BOOL use_aes) { - QTC::TC("qpdf", "qpdf-c called qpdf_set_r4_encryption_parameters"); - qpdf->qpdf_writer->setR4EncryptionParameters( + QTC::TC("qpdf", "qpdf-c called qpdf_set_r4_encryption_parameters_insecure"); + qpdf->qpdf_writer->setR4EncryptionParametersInsecure( user_password, owner_password, allow_accessibility != QPDF_FALSE, |