Skip to content

Commit 5bd266e

Browse files
committed
Many formats: Avoid incorrect 64/32 reporting in ALGORITHM_NAME
In some other formats, we're more careful by also accounting for the case of a wider than 64-bit arch, but here we take the shortcut approach for now.
1 parent 8d40a50 commit 5bd266e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/bitshares_fmt_plug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct fmt_main fmt_bitshares;
3636
#define FORMAT_NAME "BitShares Wallet"
3737
#define FORMAT_TAG "$BitShares$"
3838
#define TAG_LENGTH (sizeof(FORMAT_TAG) - 1)
39-
#define ALGORITHM_NAME "SHA512/AES/secp256k1/SHA256 64/" ARCH_BITS_STR
39+
#define ALGORITHM_NAME "SHA512/AES/secp256k1/SHA256 " ARCH_BITS_STR "/" ARCH_BITS_STR
4040
#define BENCHMARK_COMMENT ""
4141
#define BENCHMARK_LENGTH 7
4242
#define PLAINTEXT_LENGTH 125

src/dynamic_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ typedef struct private_subformat_data
287287
#define ALGORITHM_NAME_SKEIN "32/"ARCH_BITS_STR " sph_skein"
288288
#define ALGORITHM_NAME_X86_SKEIN "32/"ARCH_BITS_STR " sph_skein"
289289

290-
#define ALGORITHM_NAME_KECCAK "64/"ARCH_BITS_STR " keccak"
291-
#define ALGORITHM_NAME_X86_KECCAK "64/"ARCH_BITS_STR " keccak"
290+
#define ALGORITHM_NAME_KECCAK ARCH_BITS_STR "/" ARCH_BITS_STR " keccak"
291+
#define ALGORITHM_NAME_X86_KECCAK ARCH_BITS_STR "/" ARCH_BITS_STR " keccak"
292292

293293
#define ALGORITHM_NAME_SM3 "32/"ARCH_BITS_STR " sm3"
294294
#define ALGORITHM_NAME_X86_SM3 "32/"ARCH_BITS_STR " sm3"

src/gost12256hash_fmt_plug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ john_register_one(&fmt_gost12256hash);
4343
#elif !JOHN_NO_SIMD && __SSE2__
4444
#define ALGORITHM_NAME "GOST R 34.11-2012 128/128 SSE2 1x"
4545
#else
46-
#define ALGORITHM_NAME "GOST R 34.11-2012 64/" ARCH_BITS_STR
46+
#define ALGORITHM_NAME "GOST R 34.11-2012 " ARCH_BITS_STR "/" ARCH_BITS_STR
4747
#endif
4848

4949
#define PLAINTEXT_LENGTH 125

src/gost12512hash_fmt_plug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ john_register_one(&fmt_gost12512hash);
4343
#elif !JOHN_NO_SIMD && __SSE2__
4444
#define ALGORITHM_NAME "GOST R 34.11-2012 128/128 SSE2 1x"
4545
#else
46-
#define ALGORITHM_NAME "GOST R 34.11-2012 64/" ARCH_BITS_STR
46+
#define ALGORITHM_NAME "GOST R 34.11-2012 " ARCH_BITS_STR "/" ARCH_BITS_STR
4747
#endif
4848

4949
#define PLAINTEXT_LENGTH 125

src/stribog_fmt_plug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ john_register_one(&fmt_stribog_512);
4444
#elif !JOHN_NO_SIMD && __SSE2__
4545
#define ALGORITHM_NAME "GOST R 34.11-2012 128/128 SSE2 1x"
4646
#else
47-
#define ALGORITHM_NAME "GOST R 34.11-2012 64/" ARCH_BITS_STR
47+
#define ALGORITHM_NAME "GOST R 34.11-2012 " ARCH_BITS_STR "/" ARCH_BITS_STR
4848
#endif
4949
#define BENCHMARK_COMMENT ""
5050
#define BENCHMARK_LENGTH 0x107

0 commit comments

Comments
 (0)