From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jun 2008 16:25:16 +0000 (-0700)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
X-Git-Tag: samba-4.0.0alpha5~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d206517f90ac02e829193c5a17e5df25059cf18d;p=thirdparty%2Fsamba.git

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

d206517f90ac02e829193c5a17e5df25059cf18d
diff --cc source/lib/crypto/config.mk
index fb1c1bf6ce7,f771a0e3065..c35280abdab
--- a/source/lib/crypto/config.mk
+++ b/source/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 source/lib/crypto/crypto.h
index 03a233ec988,513ae788ded..54a4482325b
--- a/source/lib/crypto/crypto.h
+++ b/source/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];