first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / libsmb / smbdes.c

diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index 46b337cda88921c2dd995516a9dbe8a1c1f4f17f..d0e1c6e85fb00d0c91c0af57f5f1d74dc018f04e 100644 (file)
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -22,6 +22,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
 
 /* NOTES: 
 
@@ -357,64 +358,6 @@ void cred_hash3(unsigned char *out,unsigned char *in,unsigned char *key, int for
         smbhash(out + 8, in + 8, key2, forw);
 }
 
-void NTLMSSPhash( unsigned char hash[258], unsigned char key[5])
-{
-       unsigned char j = 0;
-       int ind;
-
-       unsigned char k2[8];
-
-       memcpy(k2, key, 5);
-       k2[5] = 0xe5;
-       k2[6] = 0x38;
-       k2[7] = 0xb0;
-
-       for (ind = 0; ind < 256; ind++)
-       {
-               hash[ind] = (unsigned char)ind;
-       }
-
-       for( ind = 0; ind < 256; ind++)
-       {
-               unsigned char tc;
-
-               j += (hash[ind] + k2[ind%8]);
-
-               tc = hash[ind];
-               hash[ind] = hash[j];
-               hash[j] = tc;
-       }
-
-       hash[256] = 0;
-       hash[257] = 0;
-}
-
-void NTLMSSPcalc( unsigned char hash[258], unsigned char *data, int len)
-{
-       unsigned char index_i = hash[256];
-       unsigned char index_j = hash[257];
-       int ind;
-
-       for( ind = 0; ind < len; ind++)
-       {
-               unsigned char tc;
-               unsigned char t;
-
-               index_i++;
-               index_j += hash[index_i];
-
-               tc = hash[index_i];
-               hash[index_i] = hash[index_j];
-               hash[index_j] = tc;
-
-               t = hash[index_i] + hash[index_j];
-               data[ind] = data[ind] ^ hash[t];
-       }
-
-       hash[256] = index_i;
-       hash[257] = index_j;
-}
-
 void SamOEMhash( unsigned char *data, unsigned char *key, int val)
 {
   unsigned char s_box[256];