diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2012-12-28 03:37:57 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2012-12-31 11:36:50 +0100 |
| commit | 9b42f526dffd5e1518ff3d83564eb09111ac5f0d (patch) | |
| tree | de79d55730d0d58d31a1e4fc3babd696f9d98587 /libqpdf/QPDF_encryption.cc | |
| parent | 774584163ff3d310e7c932e2a6f63b590cb736ac (diff) | |
| download | qpdf-9b42f526dffd5e1518ff3d83564eb09111ac5f0d.tar.zst | |
Update AES classes to work with 256-bit keys
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 893f93f5..43bc62ba 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -674,10 +674,10 @@ QPDF::decryptString(std::string& str, int objid, int generation) if (use_aes) { QTC::TC("qpdf", "QPDF_encryption aes decode string"); - assert(key.length() == Pl_AES_PDF::key_size); Pl_Buffer bufpl("decrypted string"); Pl_AES_PDF pl("aes decrypt string", &bufpl, false, - (unsigned char const*)key.c_str()); + (unsigned char const*)key.c_str(), + (unsigned int)key.length()); pl.write((unsigned char*)str.c_str(), str.length()); pl.finish(); PointerHolder<Buffer> buf = bufpl.getBuffer(); @@ -794,15 +794,16 @@ QPDF::decryptStream(Pipeline*& pipeline, int objid, int generation, if (use_aes) { QTC::TC("qpdf", "QPDF_encryption aes decode stream"); - assert(key.length() == Pl_AES_PDF::key_size); pipeline = new Pl_AES_PDF("AES stream decryption", pipeline, - false, (unsigned char*) key.c_str()); + false, (unsigned char*) key.c_str(), + (unsigned int) key.length()); } else { QTC::TC("qpdf", "QPDF_encryption rc4 decode stream"); pipeline = new Pl_RC4("RC4 stream decryption", pipeline, - (unsigned char*) key.c_str(), (int)key.length()); + (unsigned char*) key.c_str(), + (unsigned int) key.length()); } heap.push_back(pipeline); } |