From e507650b3fdee46332d3b0a2fc7949f992aeb60c Mon Sep 17 00:00:00 2001 From: magnum Date: Sun, 27 Nov 2011 21:44:26 +0100 Subject: [PATCH 14/16] raw-md4 tweaks, new faster set_key() --- src/rawMD4_fmt_plug.c | 199 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 143 insertions(+), 56 deletions(-) diff --git a/src/rawMD4_fmt_plug.c b/src/rawMD4_fmt_plug.c index 4a7a268..6ea30bd 100644 --- a/src/rawMD4_fmt_plug.c +++ b/src/rawMD4_fmt_plug.c @@ -2,35 +2,40 @@ * This file is part of John the Ripper password cracker, * Copyright (c) 2010 by Solar Designer * - * Use of Bartavelle's intrinsics added by magnum in 2011, + * Use of Bartavelle's mmx/sse2/intrinsics added by magnum in 2011, * no rights reserved */ #include #include "arch.h" -#include "params.h" + +#ifdef MD4_SSE_PARA +#define MMX_COEF 4 +#include "sse-intrinsics.h" +#define NBKEYS (MMX_COEF * MD4_SSE_PARA) +#elif MMX_COEF +#define NBKEYS MMX_COEF +#endif + +#include "md4.h" #include "common.h" #include "formats.h" +#include "params.h" #define FORMAT_LABEL "raw-md4" #define FORMAT_NAME "Raw MD4" #ifdef MD4_SSE_PARA -#define MMX_COEF 4 -#include "sse-intrinsics.h" -#define NBKEYS (MMX_COEF * MD4_SSE_PARA) #define ALGORITHM_NAME "SSE2i " MD4_N_STR -#define PLAINTEXT_LENGTH 54 -#define MIN_KEYS_PER_CRYPT NBKEYS -#define MAX_KEYS_PER_CRYPT NBKEYS -#define GETPOS(i, index) ( (index&(MMX_COEF-1))*4 + ((i)&(0xffffffff-3))*MMX_COEF + ((i)&3) + (index>>(MMX_COEF>>1))*16*MMX_COEF*4 ) +#elif defined(MMX_COEF) && MMX_COEF == 4 +#define ALGORITHM_NAME "SSE2 4x" +#elif defined(MMX_COEF) && MMX_COEF == 2 +#define ALGORITHM_NAME "MMX 2x" +#elif defined(MMX_COEF) +#define ALGORITHM_NAME "?" #else -#include "md4.h" #define ALGORITHM_NAME "32/" ARCH_BITS_STR -#define PLAINTEXT_LENGTH 125 -#define MIN_KEYS_PER_CRYPT 1 -#define MAX_KEYS_PER_CRYPT 1 #endif #define BENCHMARK_COMMENT "" @@ -43,26 +48,51 @@ static struct fmt_tests tests[] = { {"8a9d093f14f8701df17732b2bb182c74", "password"}, - {"$MD4$8a9d093f14f8701df17732b2bb182c74", "password"}, + {"$MD4$6d78785c44ea8dfa178748b245d8c3ae", "magnum" }, + {"$MD4$31d6cfe0d16ae931b73c59d7e0c089c0", "" }, + {"$MD4$934eb897904769085af8101ad9dabca2", "John the ripper" }, + {"$MD4$cafbb81fb64d9dd286bc851c4c6e0d21", "lolcode" }, + {"$MD4$585028aa0f794af812ee3be8804eb14a", "123456" }, + {"$MD4$23580e2a459f7ea40f9efa148b63cafb", "12345" }, + {"$MD4$2ae523785d0caf4d2fb557c12016185c", "123456789" }, + {"$MD4$f3e80e83b29b778bc092bf8a7c6907fe", "iloveyou" }, + {"$MD4$4d10a268a303379f224d8852f2d13f11", "princess" }, + {"$MD4$bf75555ca19051f694224f2f5e0b219d", "1234567" }, + {"$MD4$41f92cf74e3d2c3ba79183629a929915", "rockyou" }, + {"$MD4$012d73e0fab8d26e0f4d65e36077511e", "12345678" }, + {"$MD4$0ceb1fd260c35bd50005341532748de6", "abc123" }, {NULL} }; -#ifdef MD4_SSE_PARA +#ifdef MMX_COEF +#define PLAINTEXT_LENGTH 54 +#define MIN_KEYS_PER_CRYPT NBKEYS +#define MAX_KEYS_PER_CRYPT NBKEYS +#define GETPOS(i, index) ( (index&(MMX_COEF-1))*4 + ((i)&(0xffffffff-3))*MMX_COEF + ((i)&3) + (index>>(MMX_COEF>>1))*16*MMX_COEF*4 ) +#else +#define PLAINTEXT_LENGTH 125 +#define MIN_KEYS_PER_CRYPT 1 +#define MAX_KEYS_PER_CRYPT 1 +#endif + +#ifdef MMX_COEF /* Cygwin would not guarantee the alignment if these were declared static */ #define saved_key rawmd4_saved_key #define crypt_key rawmd4_crypt_key #if defined (_MSC_VER) -__declspec(align(16)) char saved_key[64*MAX_KEYS_PER_CRYPT]; -__declspec(align(16)) char crypt_key[BINARY_SIZE*MAX_KEYS_PER_CRYPT]; +__declspec(align(MMX_COEF*4)) unsigned char saved_key[64*MAX_KEYS_PER_CRYPT]; +__declspec(align(MMX_COEF*4)) unsigned char crypt_key[BINARY_SIZE*MAX_KEYS_PER_CRYPT]; #else -char saved_key[64*MAX_KEYS_PER_CRYPT] __attribute__ ((aligned(16))); -char crypt_key[BINARY_SIZE*MAX_KEYS_PER_CRYPT] __attribute__ ((aligned(16))); +unsigned char saved_key[64*MAX_KEYS_PER_CRYPT] __attribute__ ((aligned(MMX_COEF*4))); +unsigned char crypt_key[BINARY_SIZE*MAX_KEYS_PER_CRYPT+1] __attribute__ ((aligned(MMX_COEF*4))); +#endif +#ifndef MD4_SSE_PARA +static unsigned int total_len; #endif -static unsigned char out[PLAINTEXT_LENGTH + 1]; #else +static MD4_CTX ctx; static int saved_key_length; static char saved_key[PLAINTEXT_LENGTH + 1]; -static MD4_CTX ctx; static ARCH_WORD_32 crypt_out[4]; #endif @@ -149,7 +179,7 @@ static int binary_hash_6(void *binary) return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; } -#ifdef MD4_SSE_PARA +#ifdef MMX_COEF static int get_hash_0(int index) { unsigned int x,y; @@ -224,40 +254,78 @@ static int get_hash_4(int index) { return crypt_out[0] & 0xFFFFF; } + static int get_hash_5(int index) { return crypt_out[0] & 0xFFFFFF; } + static int get_hash_6(int index) { return crypt_out[0] & 0x7FFFFFF; } #endif -static void set_key(char *key, int index) +static void set_key(char *_key, int index) { -#ifdef MD4_SSE_PARA - int i; - - if(index==0) - memset(saved_key, 0, sizeof(saved_key)); +#ifdef MMX_COEF + const unsigned int *key = (unsigned int*)_key; + unsigned int *keybuffer = (unsigned int*)&saved_key[GETPOS(0, index)]; + unsigned int *keybuf_word = keybuffer; + unsigned int len, temp; + +#ifndef MD4_SSE_PARA + if (!index) + total_len = 0; +#endif + len = 0; + while((temp = *key++) & 0xff) { + if (!(temp & 0xff00)) + { + *keybuf_word = (temp & 0xff) | (0x80 << 8); + len++; + goto key_cleaning; + } + if (!(temp & 0xff0000)) + { + *keybuf_word = (temp & 0xffff) | (0x80 << 16); + len+=2; + goto key_cleaning; + } + if (!(temp & 0xff000000)) + { + *keybuf_word = temp | (0x80 << 24); + len+=3; + goto key_cleaning; + } + *keybuf_word = temp; + len += 4; + keybuf_word += MMX_COEF; + } + *keybuf_word = 0x80; - for(i=0;key[i];i++) - saved_key[GETPOS(i, index)] = key[i]; +key_cleaning: + keybuf_word += MMX_COEF; + while(*keybuf_word) { + *keybuf_word = 0; + keybuf_word += MMX_COEF; + } - saved_key[GETPOS(i, index)] = 0x80; - saved_key[GETPOS(56,index)] = i << 3; +#ifdef MD4_SSE_PARA + keybuffer[56] = len << 3; #else - saved_key_length = strlen(key); - if (saved_key_length > PLAINTEXT_LENGTH) - saved_key_length = PLAINTEXT_LENGTH; - memcpy(saved_key, key, saved_key_length); + total_len += len << ( (32/MMX_COEF) * index); +#endif +#else + saved_key_length = strlen(_key); + memcpy(saved_key, _key, saved_key_length); #endif } static char *get_key(int index) { -#ifdef MD4_SSE_PARA +#ifdef MMX_COEF + static char out[PLAINTEXT_LENGTH + 1]; unsigned int i,len; len = (unsigned char)saved_key[GETPOS(56,index)] >> 3; @@ -274,7 +342,9 @@ static char *get_key(int index) static void crypt_all(int count) { #ifdef MD4_SSE_PARA - SSEmd4body(saved_key, (unsigned int *)crypt_key, 1); + SSEmd4body(saved_key, (unsigned int*)crypt_key, 1); +#elif MMX_COEF + mdfourmmx(crypt_key, saved_key, total_len); #else MD4_Init(&ctx); MD4_Update(&ctx, saved_key, saved_key_length); @@ -282,47 +352,64 @@ static void crypt_all(int count) #endif } -static int cmp_all(void *binary, int count) -{ +static int cmp_all(void *binary, int count) { +#ifdef MMX_COEF #ifdef MD4_SSE_PARA - unsigned int x,y; + unsigned int x,y=0; - for(y=0;y