r10656: BIG merge from trunk. Features not copied over

[sfrench/samba-autobuild/.git] / source3 / libsmb / smbdes.c

diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index cde77f94a36047001c697a9c0e28089b54544ef7..dc49396d9e158ca9bf802d0fd52202b11aaf9407 100644 (file)
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -276,7 +276,7 @@ static void str_to_key(const unsigned char *str,unsigned char *key)
 }
 
 
-static void smbhash(unsigned char *out, const unsigned char *in, const unsigned char *key, int forw)
+void des_crypt56(unsigned char *out, const unsigned char *in, const unsigned char *key, int forw)
 {
        int i;
        char outb[64];
@@ -307,35 +307,35 @@ static void smbhash(unsigned char *out, const unsigned char *in, const unsigned
 void E_P16(const unsigned char *p14,unsigned char *p16)
 {
        unsigned char sp8[8] = {0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25};
-       smbhash(p16, sp8, p14, 1);
-       smbhash(p16+8, sp8, p14+7, 1);
+       des_crypt56(p16, sp8, p14, 1);
+       des_crypt56(p16+8, sp8, p14+7, 1);
 }
 
 void E_P24(const unsigned char *p21, const unsigned char *c8, unsigned char *p24)
 {
-       smbhash(p24, c8, p21, 1);
-       smbhash(p24+8, c8, p21+7, 1);
-       smbhash(p24+16, c8, p21+14, 1);
+       des_crypt56(p24, c8, p21, 1);
+       des_crypt56(p24+8, c8, p21+7, 1);
+       des_crypt56(p24+16, c8, p21+14, 1);
 }
 
 void D_P16(const unsigned char *p14, const unsigned char *in, unsigned char *out)
 {
-       smbhash(out, in, p14, 0);
-        smbhash(out+8, in+8, p14+7, 0);
+       des_crypt56(out, in, p14, 0);
+        des_crypt56(out+8, in+8, p14+7, 0);
 }
 
 void E_old_pw_hash( unsigned char *p14, const unsigned char *in, unsigned char *out)
 {
-        smbhash(out, in, p14, 1);
-        smbhash(out+8, in+8, p14+7, 1);
+        des_crypt56(out, in, p14, 1);
+        des_crypt56(out+8, in+8, p14+7, 1);
 }
 
 void cred_hash1(unsigned char *out, const unsigned char *in, const unsigned char *key)
 {
        unsigned char buf[8];
 
-       smbhash(buf, in, key, 1);
-       smbhash(out, buf, key+9, 1);
+       des_crypt56(buf, in, key, 1);
+       des_crypt56(out, buf, key+9, 1);
 }
 
 void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char *key)
@@ -343,58 +343,38 @@ void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char
        unsigned char buf[8];
        static unsigned char key2[8];
 
-       smbhash(buf, in, key, 1);
+       des_crypt56(buf, in, key, 1);
        key2[0] = key[7];
-       smbhash(out, buf, key2, 1);
+       des_crypt56(out, buf, key2, 1);
 }
 
 void cred_hash3(unsigned char *out, unsigned char *in, const unsigned char *key, int forw)
 {
         static unsigned char key2[8];
 
-        smbhash(out, in, key, forw);
+        des_crypt56(out, in, key, forw);
         key2[0] = key[7];
-        smbhash(out + 8, in + 8, key2, forw);
+        des_crypt56(out + 8, in + 8, key2, forw);
 }
 
-void SamOEMhash( unsigned char *data, const unsigned char *key, int val)
+/*****************************************************************
+ arc4 crypt/decrypt with a 16 byte key.
+*****************************************************************/
+
+void SamOEMhash( unsigned char *data, const unsigned char key[16], size_t len)
+{
+       unsigned char arc4_state[258];
+
+       smb_arc4_init(arc4_state, key, 16);
+       smb_arc4_crypt(arc4_state, data, len);
+}
+
+void SamOEMhashBlob( unsigned char *data, size_t len, DATA_BLOB *key)
 {
-  unsigned char s_box[256];
-  unsigned char index_i = 0;
-  unsigned char index_j = 0;
-  unsigned char j = 0;
-  int ind;
-
-  for (ind = 0; ind < 256; ind++)
-  {
-    s_box[ind] = (unsigned char)ind;
-  }
-
-  for( ind = 0; ind < 256; ind++)
-  {
-     unsigned char tc;
-
-     j += (s_box[ind] + key[ind%16]);
-
-     tc = s_box[ind];
-     s_box[ind] = s_box[j];
-     s_box[j] = tc;
-  }
-  for( ind = 0; ind < val; ind++)
-  {
-    unsigned char tc;
-    unsigned char t;
-
-    index_i++;
-    index_j += s_box[index_i];
-
-    tc = s_box[index_i];
-    s_box[index_i] = s_box[index_j];
-    s_box[index_j] = tc;
-
-    t = s_box[index_i] + s_box[index_j];
-    data[ind] = data[ind] ^ s_box[t];
-  }
+       unsigned char arc4_state[258];
+
+       smb_arc4_init(arc4_state, key->data, key->length);
+       smb_arc4_crypt(arc4_state, data, len);
 }
 
 /* Decode a sam password hash into a password.  The password hash is the
@@ -410,6 +390,6 @@ void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw)
        s[2] = s[6] = s[10]        = (uchar)((rid >> 16) & 0xFF);
        s[3] = s[7] = s[11]        = (uchar)((rid >> 24) & 0xFF);
 
-       smbhash(out, in, s, forw);
-       smbhash(out+8, in+8, s+7, forw);
+       des_crypt56(out, in, s, forw);
+       des_crypt56(out+8, in+8, s+7, forw);
 }