43 lines
1.0 KiB
Diff
43 lines
1.0 KiB
Diff
diff -Naur john-1.6.37/src/MD5_std.h john-1.6.37-apache-md5/src/MD5_std.h
|
|
--- john-1.6.37/src/MD5_std.h 2003-12-03 11:16:02.000000000 +0100
|
|
+++ john-1.6.37-apache-md5/src/MD5_std.h 2004-07-26 09:22:54.000000000 +0200
|
|
@@ -13,6 +13,9 @@
|
|
#include "arch.h"
|
|
#include "common.h"
|
|
|
|
+#define MD5_TYPE_STD 0
|
|
+#define MD5_TYPE_APACHE 1
|
|
+
|
|
typedef ARCH_WORD_32 MD5_word;
|
|
|
|
/*
|
|
@@ -88,6 +91,8 @@
|
|
#define MD5_ALGORITHM_NAME "32/" ARCH_BITS_STR
|
|
#endif
|
|
|
|
+#define MD5_MAGIC_LENGTH 10
|
|
+
|
|
/*
|
|
* Initializes the internal structures.
|
|
*/
|
|
@@ -107,16 +112,16 @@
|
|
/*
|
|
* Main encryption routine, sets MD5_out.
|
|
*/
|
|
-extern void MD5_std_crypt(void);
|
|
+extern void MD5_std_crypt(int md5_type);
|
|
|
|
/*
|
|
* Returns the salt for MD5_std_set_salt().
|
|
*/
|
|
-extern char *MD5_std_get_salt(char *ciphertext);
|
|
+extern char *MD5_std_get_salt(char *ciphertext, int md5_type);
|
|
|
|
/*
|
|
* Converts an ASCII ciphertext to binary.
|
|
*/
|
|
-extern MD5_word *MD5_std_get_binary(char *ciphertext);
|
|
+extern MD5_word *MD5_std_get_binary(char *ciphertext, int md5_type);
|
|
|
|
#endif
|