From 2a42a9ae0bbf6c0a10416f71a7dda0a79def1fae Mon Sep 17 00:00:00 2001 From: Dhiru Kholia Date: Sun, 20 Jan 2013 16:36:32 +0530 Subject: [PATCH] Use correct value of BINARY_SIZE --- src/dmg_fmt_plug.c | 2 +- src/keepass_fmt_plug.c | 2 +- src/keychain_fmt_plug.c | 2 +- src/keyring_fmt_plug.c | 2 +- src/lastpass_sniffed_fmt_plug.c | 2 +- src/o5logon_fmt_plug.c | 2 +- src/opencl_dmg_fmt.c | 2 +- src/opencl_keychain_fmt.c | 2 +- src/opencl_zip_fmt.c | 2 +- src/pkzip_fmt_plug.c | 2 +- src/sip_fmt_plug.c | 4 ++-- src/ssh_ng_fmt_plug.c | 2 +- src/strip_fmt_plug.c | 2 +- src/zip_fmt.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/dmg_fmt_plug.c b/src/dmg_fmt_plug.c index babd04f..5550f58 100644 --- a/src/dmg_fmt_plug.c +++ b/src/dmg_fmt_plug.c @@ -54,7 +54,7 @@ #define ALGORITHM_NAME "32/" ARCH_BITS_STR #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 -#define BINARY_SIZE 2 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/keepass_fmt_plug.c b/src/keepass_fmt_plug.c index cbcabd5..203edb4 100644 --- a/src/keepass_fmt_plug.c +++ b/src/keepass_fmt_plug.c @@ -35,7 +35,7 @@ #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 #define PLAINTEXT_LENGTH 32 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/keychain_fmt_plug.c b/src/keychain_fmt_plug.c index f5594a8..6415233 100644 --- a/src/keychain_fmt_plug.c +++ b/src/keychain_fmt_plug.c @@ -30,7 +30,7 @@ #define ALGORITHM_NAME "32/" ARCH_BITS_STR #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(*salt_struct) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/keyring_fmt_plug.c b/src/keyring_fmt_plug.c index 0f22b56..17b9498 100644 --- a/src/keyring_fmt_plug.c +++ b/src/keyring_fmt_plug.c @@ -29,7 +29,7 @@ #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 #define PLAINTEXT_LENGTH 15 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(*cur_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/lastpass_sniffed_fmt_plug.c b/src/lastpass_sniffed_fmt_plug.c index 1507224..f820a9e 100644 --- a/src/lastpass_sniffed_fmt_plug.c +++ b/src/lastpass_sniffed_fmt_plug.c @@ -35,7 +35,7 @@ #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 #define PLAINTEXT_LENGTH 15 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/o5logon_fmt_plug.c b/src/o5logon_fmt_plug.c index 6793d14..86d917a 100644 --- a/src/o5logon_fmt_plug.c +++ b/src/o5logon_fmt_plug.c @@ -34,7 +34,7 @@ static int omp_t = 1; #define PLAINTEXT_LENGTH 32 #define CIPHERTEXT_LENGTH 48 #define SALT_LENGTH 10 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/opencl_dmg_fmt.c b/src/opencl_dmg_fmt.c index 9923784..4d035ff 100644 --- a/src/opencl_dmg_fmt.c +++ b/src/opencl_dmg_fmt.c @@ -27,7 +27,7 @@ #define KEYS_PER_CRYPT 1024*9 #define MIN_KEYS_PER_CRYPT KEYS_PER_CRYPT #define MAX_KEYS_PER_CRYPT KEYS_PER_CRYPT -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define PLAINTEXT_LENGTH 64 #define SALT_SIZE sizeof(struct custom_salt) diff --git a/src/opencl_keychain_fmt.c b/src/opencl_keychain_fmt.c index 4773c88..fd15947 100644 --- a/src/opencl_keychain_fmt.c +++ b/src/opencl_keychain_fmt.c @@ -27,7 +27,7 @@ # define SWAP(n) \ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define PLAINTEXT_LENGTH 64 #define SALT_SIZE sizeof(*salt_struct) #define SALTLEN 20 diff --git a/src/opencl_zip_fmt.c b/src/opencl_zip_fmt.c index fe6d69e..6702bf8 100644 --- a/src/opencl_zip_fmt.c +++ b/src/opencl_zip_fmt.c @@ -28,7 +28,7 @@ # define SWAP(n) \ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define PLAINTEXT_LENGTH 64 #define SALT_SIZE sizeof(zip_cpu_salt) diff --git a/src/pkzip_fmt_plug.c b/src/pkzip_fmt_plug.c index bfa72cb..6aa5345 100644 --- a/src/pkzip_fmt_plug.c +++ b/src/pkzip_fmt_plug.c @@ -39,7 +39,7 @@ #define PLAINTEXT_LENGTH 31 -#define BINARY_SIZE 1 +#define BINARY_SIZE 0 #define SALT_SIZE (sizeof(PKZ_SALT*)) #define MIN_KEYS_PER_CRYPT 1 diff --git a/src/sip_fmt_plug.c b/src/sip_fmt_plug.c index 54b1269..47ac6b3 100644 --- a/src/sip_fmt_plug.c +++ b/src/sip_fmt_plug.c @@ -44,7 +44,7 @@ static sip_salt *pSalt; #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 #define PLAINTEXT_LENGTH 32 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(sip_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 64 @@ -83,7 +83,7 @@ static int valid(char *ciphertext, struct fmt_main *self) } // NOTE, this still needs work. I am sure this will not eliminate (compact out) -// duplicate salts. +// duplicate salts. static void *get_salt(char *ciphertext) { sip_salt *salt; diff --git a/src/ssh_ng_fmt_plug.c b/src/ssh_ng_fmt_plug.c index c9e148c..7d66919 100644 --- a/src/ssh_ng_fmt_plug.c +++ b/src/ssh_ng_fmt_plug.c @@ -35,7 +35,7 @@ static int omp_t = 1; #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1001 #define PLAINTEXT_LENGTH 32 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/strip_fmt_plug.c b/src/strip_fmt_plug.c index c21e61d..ecc3afc 100644 --- a/src/strip_fmt_plug.c +++ b/src/strip_fmt_plug.c @@ -28,7 +28,7 @@ #define ALGORITHM_NAME "32/" ARCH_BITS_STR #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 -#define BINARY_SIZE 16 +#define BINARY_SIZE 0 #define SALT_SIZE sizeof(struct custom_salt) #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 1 diff --git a/src/zip_fmt.c b/src/zip_fmt.c index 171de68..f5c7dbd 100644 --- a/src/zip_fmt.c +++ b/src/zip_fmt.c @@ -39,7 +39,7 @@ #define ALGORITHM_NAME "32/" ARCH_BITS_STR #define BENCHMARK_COMMENT "" #define BENCHMARK_LENGTH -1 -#define BINARY_SIZE 2 +#define BINARY_SIZE 0 #define SALT_SIZE 512 #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 96 -- 1.8.1.1