Iterated-sha1: Don't accept raw ciphertexts except XSHA

Bare XSHA need to 46 chars of uppercase hex. Pot entries will still
be iterated-sha1 canonical, tagged and in lowercase.

Author: magnumripper

src/iterated_sha1_common_plug.c

@@ -25,6 +25,7 @@ struct fmt_tests iterated_sha1_tests[] = {
 	// 8 bytes salt, 1024 iterations
 	{"$sisha1$1024$6f77746f6f77746f5fa823ad3c2dc9b58893df73d52b2108b2efce45", "magnum"},
 	{"$sisha1$1024$6a6f686e72697070a3a2baadacf154dca88a9ea31400481748e253bb", "password"},
+	{"$sisha1$1024$6a6f686e72697070a48cd538757a88deaf12b93f4758e27017852ba3", "John the Ripper"},
 	// 6 bytes salt, 512 iterations
 	{"$sisha1$512$cafe80babe000cd885f153e249671f703039a5dce8a4ad771175", "ripper"},
 	// 3 bytes salt, 2 iterations
@@ -33,17 +34,15 @@ struct fmt_tests iterated_sha1_tests[] = {
 	{"$sisha1$1$73616c74d46dd115de9a2f3bf32d42b38d1b437e5f8b92a7", "clear"},
 	// Raw SHA-1 (just for testing)
 	{"$sisha1$1$2fbf0eba37de1d1d633bc1ed943b907f9b360d4c", "azertyuiop1"},
-	// Raw ciphertexts:
-	// 1024 iterations (default)
-	{"6a6f686e72697070a48cd538757a88deaf12b93f4758e27017852ba3", "John the Ripper"},
-	// XSHA: 4 bytes salt, 1 iteration (implicit for length 48 only)
-	{"474379622bd7b9f84bd6e4bb52abf9d01705efb0a2426655", "passWOrd"},
+
+	// XSHA: uppercase, 4 bytes salt, 1 iteration (implicit for length 48 only)
+	{"474379622BD7B9F84BD6E4BB52ABF9D01705EFB0A2426655", "passWOrd"},
 	{NULL}
 };
 
 /*
- * Convert raw ciphertext to canonical ciphertext with inferred salt length
- * and 1024 iterations (with exception for XSHA).
+ * Convert raw XSHA ciphertext to canonical ciphertext. Other lengths
+ * or iterations need to be in canonical, tagged, format.
  */
 char *iterated_sha1_prepare(char *fields[10], struct fmt_main *self)
 {
@@ -52,23 +51,25 @@ char *iterated_sha1_prepare(char *fields[10], struct fmt_main *self)
 	if (!strncasecmp(fields[1], FORMAT_TAG, FORMAT_TAG_LEN))
 		return fields[1];
 
-	int len = strnlen(fields[1], 56 + 1);
-	int iter, extra;
+	int len = strnlen(fields[1], 48 + 1);
+	int extra;
 
-	if (len < MIN_CIPHERTEXT_LEN || len > MAX_CIPHERTEXT_LEN)
-		return fields[1];
-	if (hexlenl(fields[1], &extra) != len || extra)
+	if (len != 48)
 		return fields[1];
 
-	if (len == 48) // XSHA
-		iter = 1;
-	else
-		iter = 1024;
+	if (hexlenu(fields[1], &extra) != 48 || extra)
+		return fields[1];
 
-	sprintf(out, "%s%d$%s", FORMAT_TAG, iter, fields[1]);
+	sprintf(out, "%s1$%s", FORMAT_TAG, fields[1]);
+	strlwr(out);
 	return out;
 }
 
+/*
+ * $sisha1$<iter>$<hex_salt><hex_hash>
+ *
+ * No separator between salt and hash.
+ */
 int iterated_sha1_valid(char *ciphertext, struct fmt_main *self)
 {
 	if (strncasecmp(ciphertext, FORMAT_TAG, FORMAT_TAG_LEN))
@@ -86,7 +87,7 @@ int iterated_sha1_valid(char *ciphertext, struct fmt_main *self)
 		return 0;
 
 	int extra;
-	if (hexlenl(ciphertext, &extra) < MIN_CIPHERTEXT_LEN || extra)
+	if (hexlen(ciphertext, &extra) < MIN_CIPHERTEXT_LEN || extra)
 		return 0;
 
 	return 1;