Salted SHA formats: Make it clear what algo is used

salted-sha1 and SSHA512 are ($p.$s)
XSHA and XSHA512 are ($s.$p)

Author: magnumripper

src/XSHA512_fmt_plug.c

@@ -24,7 +24,7 @@ john_register_one(&fmt_XSHA512);
 
 #define FORMAT_LABEL			"xsha512"
 #define FORMAT_NAME			"Mac OS X 10.7"
-#define ALGORITHM_NAME			"SHA512 " SHA512_ALGORITHM_NAME
+#define ALGORITHM_NAME			"SHA512 ($s.$p) " SHA512_ALGORITHM_NAME
 
 #define PLAINTEXT_LENGTH		107
 

src/XSHA_fmt_plug.c

@@ -37,7 +37,7 @@ static unsigned int threads = 1;
 #define FORMAT_LABEL			"xsha"
 #define FORMAT_NAME			"Mac OS X 10.4 - 10.6"
 
-#define ALGORITHM_NAME			"SHA1 " SHA1_ALGORITHM_NAME
+#define ALGORITHM_NAME			"SHA1 ($s.$p)" SHA1_ALGORITHM_NAME
 
 #define BENCHMARK_COMMENT		""
 #define BENCHMARK_LENGTH		7

src/opencl_salted_sha_fmt_plug.c

@@ -33,7 +33,7 @@ john_register_one(&FMT_STRUCT);
 
 #define FORMAT_LABEL			"salted-SHA1-opencl"
 #define FORMAT_NAME			""
-#define ALGORITHM_NAME			"SHA1 OpenCL"
+#define ALGORITHM_NAME			"SHA1 ($p.$s) OpenCL"
 
 #define BENCHMARK_COMMENT		""
 #define BENCHMARK_LENGTH		7

src/opencl_xsha512_fmt_plug.c

@@ -34,8 +34,8 @@ john_register_one(&fmt_opencl_xsha512);
 #include "rawSHA512_common.h"
 
 #define FORMAT_LABEL			"XSHA512-free-opencl"
-#define FORMAT_NAME			"Mac OS X 10.7+"
-#define ALGORITHM_NAME			"SHA512 OpenCL (efficient at \"many salts\" only)"
+#define FORMAT_NAME			"Mac OS X 10.7"
+#define ALGORITHM_NAME			"SHA512 ($s.$p) OpenCL (efficient at \"many salts\" only)"
 
 #define BENCHMARK_COMMENT		""
 

src/salted_sha1_fmt_plug.c

@@ -33,7 +33,7 @@ john_register_one(&fmt_saltedsha);
 #define FORMAT_LABEL			"Salted-SHA1"
 #define FORMAT_NAME			""
 
-#define ALGORITHM_NAME			"SHA1 " SHA1_ALGORITHM_NAME
+#define ALGORITHM_NAME			"SHA1 ($p.$s) " SHA1_ALGORITHM_NAME
 
 #define BENCHMARK_COMMENT		""
 #define BENCHMARK_LENGTH		7

src/ssha512_fmt_plug.c

@@ -30,15 +30,15 @@ john_register_one(&fmt_saltedsha2);
 #include "rawSHA512_common.h"
 
 #define FORMAT_LABEL                    "SSHA512"
-#define FORMAT_NAME                     "LDAP"
+#define FORMAT_NAME                     "LDAP {SSHA512}"
 
 #ifdef SIMD_COEF_64
-#define ALGORITHM_NAME					"SHA512 " SHA512_ALGORITHM_NAME
+#define ALGORITHM_NAME					"SHA512 ($p.$s) " SHA512_ALGORITHM_NAME
 #else
 #if ARCH_BITS >= 64
-#define ALGORITHM_NAME					"SHA512 64/" ARCH_BITS_STR
+#define ALGORITHM_NAME					"SHA512 ($p.$s) 64/" ARCH_BITS_STR
 #else
-#define ALGORITHM_NAME					"SHA512 32/" ARCH_BITS_STR
+#define ALGORITHM_NAME					"SHA512 ($p.$s) 32/" ARCH_BITS_STR
 #endif
 #endif