diff --git a/job.sums b/job.sums index ee8f1bc0..bae3dd3a 100644 --- a/job.sums +++ b/job.sums @@ -6,12 +6,12 @@ include/qpdf/auto_job_c_enc.hh 72e138c7b96ed5aacdce78c1dec04b1c20d361faec4f8faf5 include/qpdf/auto_job_c_main.hh 516adb23cc7e44e614e436880be870d0574e4ebbc706cd855a1360000eed31bb include/qpdf/auto_job_c_pages.hh 931840b329a36ca0e41401190e04537b47f2867671a6643bfd8da74014202671 include/qpdf/auto_job_c_uo.hh 0585b7de459fa479d9e51a45fa92de0ff6dee748efc9ec1cedd0dde6cee1ad50 -job.yml 14622557f5c96f379645f01c3d21b3d03bb8fd9c6062a3af429430d5348f5538 +job.yml 2ccc58ef74b875524505d7f00561b2df27ec2000846a549ac21a1fdd2f74c096 libqpdf/qpdf/auto_job_decl.hh 9f79396ec459f191be4c5fe34cf88c265cf47355a1a945fa39169d1c94cf04f6 libqpdf/qpdf/auto_job_help.hh 23c79f1d2c02bda28f64aace17f69487205c797e7ae2234892cbbabab49d6d47 libqpdf/qpdf/auto_job_init.hh 8e9e31b6099a662497339b27f6e2d7f779f35011e88a834bee8811c33405a0fe libqpdf/qpdf/auto_job_json_decl.hh 4846055075dcb7365c56c02150e955979b522d14f4329ce7a8a302ccd1d7aa2a -libqpdf/qpdf/auto_job_json_init.hh a8053ffcd4cc8c533a269805c79bba6757e5d17800f0d18938adf16e896694a3 -libqpdf/qpdf/auto_job_schema.hh 3cd89b775118e09aa99fed200ca36c8a8dec8d17bc039012ca210b6a33ce1d8a +libqpdf/qpdf/auto_job_json_init.hh 8ccfcfe06339c69631da2167cd1a77844a3cc9031e4090998113ef70b96bcb70 +libqpdf/qpdf/auto_job_schema.hh 27cadf4f0c99dd27c569ec6d870a51d2abb51c8daaad94a55c42b6e86cf7726a manual/_ext/qpdf.py e9ac9d6c70642a3d29281ee5ad92ae2422dee8be9306fb8a0bc9dba0ed5e28f3 manual/cli.rst 79140e023faa0cb77afe0b1dc512dd120ee5617f4db82f842596e4f239f93882 diff --git a/job.yml b/job.yml index 5f956dd1..92702c70 100644 --- a/job.yml +++ b/job.yml @@ -277,6 +277,7 @@ json: recompress-flate: decode-level: decrypt: + deterministic-id: static-aes-iv: static-id: no-original-object-ids: @@ -343,7 +344,6 @@ json: - null _options: allow-weak-crypto: - deterministic-id: keep-files-open: keep-files-open-threshold: no-warn: diff --git a/libqpdf/qpdf/auto_job_json_init.hh b/libqpdf/qpdf/auto_job_json_init.hh index 3e082b84..68808130 100644 --- a/libqpdf/qpdf/auto_job_json_init.hh +++ b/libqpdf/qpdf/auto_job_json_init.hh @@ -66,6 +66,9 @@ popHandler(); // key: decodeLevel pushKey("decrypt"); addBare([this]() { c_main->decrypt(); }); popHandler(); // key: decrypt +pushKey("deterministicId"); +addBare([this]() { c_main->deterministicId(); }); +popHandler(); // key: deterministicId pushKey("staticAesIv"); addBare([this]() { c_main->staticAesIv(); }); popHandler(); // key: staticAesIv @@ -263,9 +266,6 @@ beginDict(bindJSON(&Handlers::beginOptions), bindBare(&Handlers::endOptions)); / pushKey("allowWeakCrypto"); addBare([this]() { c_main->allowWeakCrypto(); }); popHandler(); // key: allowWeakCrypto -pushKey("deterministicId"); -addBare([this]() { c_main->deterministicId(); }); -popHandler(); // key: deterministicId pushKey("keepFilesOpen"); addChoices(yn_choices, [this](char const* p) { c_main->keepFilesOpen(p); }); popHandler(); // key: keepFilesOpen diff --git a/libqpdf/qpdf/auto_job_schema.hh b/libqpdf/qpdf/auto_job_schema.hh index 2a621ac9..9b85536a 100644 --- a/libqpdf/qpdf/auto_job_schema.hh +++ b/libqpdf/qpdf/auto_job_schema.hh @@ -18,6 +18,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "recompressFlate": "uncompress and recompress flate", "decodeLevel": "control which streams to uncompress", "decrypt": "remove encryption from input file", + "deterministicId": "generate ID deterministically", "staticAesIv": "use a fixed AES vector", "staticId": "use a fixed document ID", "noOriginalObjectIds": "omit original object IDs in qdf", @@ -93,7 +94,6 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ }, "options": { "allowWeakCrypto": "allow insecure cryptographic algorithms", - "deterministicId": "generate ID deterministically", "keepFilesOpen": "manage keeping multiple files open", "keepFilesOpenThreshold": "set threshold for keepFilesOpen", "noWarn": "suppress printing of warning messages",