Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 7 insertions, 6 deletions

diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index 98d5cd05b7..8087d66799 100644
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -388,18 +388,19 @@ void des_crypt112_16(unsigned char out[16], unsigned char in[16], const unsigned
 
 void SamOEMhash( unsigned char *data, const unsigned char key[16], size_t len)
 {
-	unsigned char arc4_state[258];
+	struct arcfour_state arc4_state;
+	const DATA_BLOB keyblob = data_blob_const(key, 16);
 
-	smb_arc4_init(arc4_state, key, 16);
-	smb_arc4_crypt(arc4_state, data, len);
+	arcfour_init(&arc4_state, &keyblob);
+	arcfour_crypt_sbox(&arc4_state, data, len);
 }
 
 void SamOEMhashBlob( unsigned char *data, size_t len, DATA_BLOB *key)
 {
-	unsigned char arc4_state[258];
+	struct arcfour_state arc4_state;
 
-	smb_arc4_init(arc4_state, key->data, key->length);
-	smb_arc4_crypt(arc4_state, data, len);
+	arcfour_init(&arc4_state, key);
+	arcfour_crypt_sbox(&arc4_state, data, len);
 }
 
 /* Decode a sam password hash into a password.  The password hash is the