From 4628f7b3f72d55df2860a3df5e5018fcee4e837d Mon Sep 17 00:00:00 2001
From: magnum <magnum>
Date: Sat, 12 Nov 2011 13:30:04 +0100
Subject: [PATCH] Fixes bogus use of SHA1_N_STR in a couple formats:
 OPENLDAPS_fmt (openssha) NSLDAPS_fmt (ssha) NSLDAP_fmt
 (nsldap)

---
 src/NSLDAPS_fmt_plug.c   |    8 +++-----
 src/NSLDAP_fmt_plug.c    |    8 +++-----
 src/OPENLDAPS_fmt_plug.c |   10 +++++-----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/NSLDAPS_fmt_plug.c b/src/NSLDAPS_fmt_plug.c
index 9bc2fc2..9c545c9 100644
--- a/src/NSLDAPS_fmt_plug.c
+++ b/src/NSLDAPS_fmt_plug.c
@@ -16,12 +16,10 @@
 #define FORMAT_LABEL			"ssha"
 #define FORMAT_NAME			"Netscape LDAP SSHA"
 
-#ifdef SHA1_N_STR
-#define ALGORITHM_NAME			SHA1_N_STR
-#elif defined(MMX_COEF) && MMX_COEF == 4
-#define ALGORITHM_NAME			"4x"
+#if defined(MMX_COEF) && MMX_COEF == 4
+#define ALGORITHM_NAME			"SSE2 4x"
 #elif defined(MMX_COEF) && MMX_COEF == 2
-#define ALGORITHM_NAME			"2x"
+#define ALGORITHM_NAME			"MMX 2x"
 #elif defined(MMX_COEF)
 #define ALGORITHM_NAME			"?"
 #else
diff --git a/src/NSLDAP_fmt_plug.c b/src/NSLDAP_fmt_plug.c
index 76eb330..8579005 100644
--- a/src/NSLDAP_fmt_plug.c
+++ b/src/NSLDAP_fmt_plug.c
@@ -15,12 +15,10 @@
 #define FORMAT_LABEL			"nsldap"
 #define FORMAT_NAME			"Netscape LDAP SHA"
 
-#ifdef SHA1_N_STR
-#define ALGORITHM_NAME			SHA1_N_STR
-#elif defined(MMX_COEF) && MMX_COEF == 4
-#define ALGORITHM_NAME			"4x"
+#if defined(MMX_COEF) && MMX_COEF == 4
+#define ALGORITHM_NAME			"SSE2 4x"
 #elif defined(MMX_COEF) && MMX_COEF == 2
-#define ALGORITHM_NAME			"2x"
+#define ALGORITHM_NAME			"MMX 2x"
 #elif defined(MMX_COEF)
 #define ALGORITHM_NAME			"?"
 #else
diff --git a/src/OPENLDAPS_fmt_plug.c b/src/OPENLDAPS_fmt_plug.c
index a613d2d..41940b4 100644
--- a/src/OPENLDAPS_fmt_plug.c
+++ b/src/OPENLDAPS_fmt_plug.c
@@ -14,18 +14,18 @@
 #include "sha.h"
 #include "base64.h"
 
+// This format has some MMX/SSE sha things in there but it's not completed.
+// We should re-work it to use sse-intrinsics
 #undef MMX_COEF
 #undef MMX_TYPE
 
 #define FORMAT_LABEL			"openssha"
 #define FORMAT_NAME			"OpenLDAP SSHA"
 
-#ifdef SHA1_N_STR
-#define ALGORITHM_NAME			SHA1_N_STR
-#elif defined(MMX_COEF) && MMX_COEF == 4
-#define ALGORITHM_NAME			"4x"
+#if defined(MMX_COEF) && MMX_COEF == 4
+#define ALGORITHM_NAME			"SSE2 4x"
 #elif defined(MMX_COEF) && MMX_COEF == 2
-#define ALGORITHM_NAME			"2x"
+#define ALGORITHM_NAME			"MMX 2x"
 #elif defined(MMX_COEF)
 #define ALGORITHM_NAME			"?"
 #else
-- 
1.7.5.4