ZIP formats: Report cost (data size) in KiB

The cost functions use unsigned int, so can't describe 4 GiB or larger
correctly without this.

Closes #5733

Author: magnumripper

src/opencl_zip_fmt_plug.c

@@ -374,13 +374,6 @@ static int cmp_exact(char *source, int index)
 }
 
 
-static unsigned int cost_hmac_len(void *salt)
-{
-	winzip_salt *s = *((winzip_salt**)salt);
-
-	return s->comp_len;
-}
-
 struct fmt_main fmt_opencl_zip = {
 	{
 		FORMAT_LABEL,
@@ -398,7 +391,7 @@ struct fmt_main fmt_opencl_zip = {
 		MAX_KEYS_PER_CRYPT,
 		FMT_CASE | FMT_8_BIT | FMT_DYNA_SALT | FMT_HUGE_INPUT,
 		{
-			"HMAC size"
+			"HMAC size [KiB]"
 		},
 		{ WINZIP_FORMAT_TAG },
 		winzip_common_tests
@@ -412,7 +405,7 @@ struct fmt_main fmt_opencl_zip = {
 		winzip_common_binary,
 		winzip_common_get_salt,
 		{
-			cost_hmac_len
+			winzip_common_cost_hmac_len
 		},
 		fmt_default_source,
 		{

src/pkzip.c

@@ -248,3 +248,10 @@ void *winzip_common_binary(char *ciphertext) {
 	}
 	return bin;
 }
+
+unsigned int winzip_common_cost_hmac_len(void *salt)
+{
+	winzip_salt *s = *((winzip_salt**)salt);
+
+	return (s->comp_len + 1023) / 1024;
+}

src/pkzip.h

@@ -106,6 +106,7 @@ extern int winzip_common_valid(char *ciphertext, struct fmt_main *self);
 extern char *winzip_common_split(char *ciphertext, int index, struct fmt_main *self);
 extern void *winzip_common_binary(char *ciphertext);
 extern void *winzip_common_get_salt(char *ciphertext);
+extern unsigned int winzip_common_cost_hmac_len(void *salt);
 
 extern struct fmt_tests winzip_common_tests[];
 

src/zip_fmt_plug.c

@@ -208,13 +208,6 @@ static int cmp_exact(char *source, int index)
 	return 1;
 }
 
-static unsigned int cost_hmac_len(void *salt)
-{
-	winzip_salt *s = *((winzip_salt**)salt);
-
-	return s->comp_len;
-}
-
 struct fmt_main fmt_zip = {
 	{
 		FORMAT_LABEL,
@@ -232,7 +225,7 @@ struct fmt_main fmt_zip = {
 		MAX_KEYS_PER_CRYPT,
 		FMT_CASE | FMT_8_BIT | FMT_OMP | FMT_DYNA_SALT | FMT_HUGE_INPUT,
 		{
-			"HMAC size"
+			"HMAC size [KiB]"
 		},
 		{ WINZIP_FORMAT_TAG },
 		winzip_common_tests
@@ -246,7 +239,7 @@ struct fmt_main fmt_zip = {
 		winzip_common_binary,
 		winzip_common_get_salt,
 		{
-			cost_hmac_len
+			winzip_common_cost_hmac_len
 		},
 		fmt_default_source,
 		{