Switched to usage of libjte-2.0.0. New -jigdo parameters "checksum_algorithm", "demand_checksum", "checksum_path". New -as mkisofs options-jigdo-checksum-algorithm, "-checksum-list", "-jigdo-force-checksum".

This commit is contained in:
2019-11-24 13:34:30 +01:00
parent c4894d8ae3
commit 1557304c96
12 changed files with 326 additions and 182 deletions

View File

@ -765,8 +765,10 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg,
goto jte_failed;
xorriso->libjte_params_given|= 8;
} else if(strcmp(aspect, "md5_path") == 0 ||
strcmp(aspect, "-md5-list") == 0) {
ret= libjte_set_md5_path(jte, arg);
strcmp(aspect, "-md5-list") == 0 ||
strcmp(aspect, "checksum_path") == 0 ||
strcmp(aspect, "-checksum-list") == 0) {
ret= libjte_set_checksum_path(jte, arg);
if(ret <= 0)
goto jte_failed;
xorriso->libjte_params_given|= 16;
@ -802,8 +804,10 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg,
goto jte_failed;
xorriso->libjte_params_given|= 512;
} else if(strcmp(aspect, "demand_md5") == 0 ||
strcmp(aspect, "-jigdo-force-md5") == 0) {
ret= libjte_add_md5_demand(jte, arg);
strcmp(aspect, "-jigdo-force-md5") == 0 ||
strcmp(aspect, "demand_checksum") == 0 ||
strcmp(aspect, "-jigdo-force-checksum") == 0) {
ret= libjte_add_checksum_demand(jte, arg);
if(ret <= 0)
goto jte_failed;
xorriso->libjte_params_given|= 1024;
@ -813,6 +817,13 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg,
if(ret <= 0)
goto jte_failed;
xorriso->libjte_params_given|= 2048;
} else if(strcmp(aspect, "checksum_algorithm") == 0 ||
strcmp(aspect, "-jigdo-checksum-algorithm") == 0) {
int ck_size;
ret= libjte_set_checksum_algorithm(jte, arg, &ck_size);
if(ret <= 0)
goto jte_failed;
xorriso->libjte_params_given|= 4096;
} else {
sprintf(xorriso->info_text, "-jigdo: unknown aspect '%s'", aspect);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);