Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit d206517f90ac02e829193c5a17e5df25059cf18d)

diff --cc source4/lib/crypto/config.mk
index fb1c1bf6ce730a03f2ebbde22fa04c5c2a5728a6,f771a0e30659a1fb1f072b4fee089a70472b360a..c35280abdabcfda2782925c053f856a15992cf87
--- 1/source4/lib/crypto/config.mk
--- 2/source4/lib/crypto/config.mk
+++ b/source4/lib/crypto/config.mk
@@@ -6,8 -6,8 +6,7 @@@
  
  LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
                                         crc32.o md5.o hmacmd5.o md4.o \
-                                        arcfour.o sha1.o hmacsha1.o hmacsha256.o)
 -                                       arcfour.o)
--
++                                       arcfour.o hmacsha256.o)
  
  [MODULE::TORTURE_LIBCRYPTO]
  SUBSYSTEM = smbtorture

diff --cc source4/lib/crypto/crypto.h
index 03a233ec988c02672f7fa24dea77b26550052ec9,513ae788dedafcbdcb47b7d0219699187e55a34f..54a4482325bf8b761f18614e57ccee021abe6401
--- 1/source4/lib/crypto/crypto.h
--- 2/source4/lib/crypto/crypto.h
+++ b/source4/lib/crypto/crypto.h
@@@ -21,10 -21,6 +21,8 @@@
  #include "lib/crypto/md4.h"
  #include "lib/crypto/md5.h"
  #include "lib/crypto/hmacmd5.h"
- #include "lib/crypto/sha1.h"
- #include "lib/crypto/hmacsha1.h"
 +#include "heimdal/lib/hcrypto/sha.h"
 +#include "lib/crypto/hmacsha256.h"
  
  struct arcfour_state {
        uint8_t sbox[256];