3 files changed, 6 insertions, 135 deletions
diff --git a/source4/heimdal/lib/ntlm/heimntlm-protos.h b/source4/heimdal/lib/ntlm/heimntlm-protos.h
deleted file mode 100644
index bc64791b43..0000000000
--- a/source4/heimdal/lib/ntlm/heimntlm-protos.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* This is a generated file */
-#ifndef __heimntlm_protos_h__
-#define __heimntlm_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int
-heim_ntlm_build_ntlm1_master (
-	void */*key*/,
-	size_t /*len*/,
-	struct ntlm_buf */*session*/,
-	struct ntlm_buf */*master*/);
-
-int
-heim_ntlm_calculate_ntlm1 (
-	void */*key*/,
-	size_t /*len*/,
-	unsigned char challange[8],
-	struct ntlm_buf */*answer*/);
-
-int
-heim_ntlm_calculate_ntlm2 (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	const unsigned char serverchallange[8],
-	const struct ntlm_buf */*infotarget*/,
-	unsigned char ntlmv2[16],
-	struct ntlm_buf */*answer*/);
-
-int
-heim_ntlm_calculate_ntlm2_sess (
-	const unsigned char clnt_nonce[8],
-	const unsigned char svr_chal[8],
-	const unsigned char ntlm_hash[16],
-	struct ntlm_buf */*lm*/,
-	struct ntlm_buf */*ntlm*/);
-
-int
-heim_ntlm_decode_targetinfo (
-	const struct ntlm_buf */*data*/,
-	int /*ucs2*/,
-	struct ntlm_targetinfo */*ti*/);
-
-int
-heim_ntlm_decode_type1 (
-	const struct ntlm_buf */*buf*/,
-	struct ntlm_type1 */*data*/);
-
-int
-heim_ntlm_decode_type2 (
-	const struct ntlm_buf */*buf*/,
-	struct ntlm_type2 */*type2*/);
-
-int
-heim_ntlm_decode_type3 (
-	const struct ntlm_buf */*buf*/,
-	int /*ucs2*/,
-	struct ntlm_type3 */*type3*/);
-
-int
-heim_ntlm_encode_targetinfo (
-	const struct ntlm_targetinfo */*ti*/,
-	int /*ucs2*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type1 (
-	const struct ntlm_type1 */*type1*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type2 (
-	const struct ntlm_type2 */*type2*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type3 (
-	const struct ntlm_type3 */*type3*/,
-	struct ntlm_buf */*data*/);
-
-void
-heim_ntlm_free_buf (struct ntlm_buf */*p*/);
-
-void
-heim_ntlm_free_targetinfo (struct ntlm_targetinfo */*ti*/);
-
-void
-heim_ntlm_free_type1 (struct ntlm_type1 */*data*/);
-
-void
-heim_ntlm_free_type2 (struct ntlm_type2 */*data*/);
-
-void
-heim_ntlm_free_type3 (struct ntlm_type3 */*data*/);
-
-int
-heim_ntlm_nt_key (
-	const char */*password*/,
-	struct ntlm_buf */*key*/);
-
-void
-heim_ntlm_ntlmv2_key (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	unsigned char ntlmv2[16]);
-
-int
-heim_ntlm_verify_ntlm2 (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	time_t /*now*/,
-	const unsigned char serverchallange[8],
-	const struct ntlm_buf */*answer*/,
-	struct ntlm_buf */*infotarget*/,
-	unsigned char ntlmv2[16]);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __heimntlm_protos_h__ */
diff --git a/source4/heimdal/lib/ntlm/heimntlm.h b/source4/heimdal/lib/ntlm/heimntlm.h
index 09d2205fd2..e26cf950ee 100644
--- a/source4/heimdal/lib/ntlm/heimntlm.h
+++ b/source4/heimdal/lib/ntlm/heimntlm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: heimntlm.h 22376 2007-12-28 18:38:23Z lha $ */
+/* $Id$ */
 
 #ifndef HEIM_NTLM_H
 #define HEIM_NTLM_H
diff --git a/source4/heimdal/lib/ntlm/ntlm.c b/source4/heimdal/lib/ntlm/ntlm.c
index d3309824b5..244df54bb6 100644
--- a/source4/heimdal/lib/ntlm/ntlm.c
+++ b/source4/heimdal/lib/ntlm/ntlm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
+ * Copyright (c) 2006 - 2008 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-RCSID("$Id: ntlm.c 23169 2008-05-22 02:52:07Z lha $");
+RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +46,8 @@ RCSID("$Id: ntlm.c 23169 2008-05-22 02:52:07Z lha $");
 #include <krb5.h>
 #include <roken.h>
 
+#define HC_DEPRECATED_CRYPTO
+
 #include "krb5-types.h"
 #include "crypto-headers.h"
 
@@ -1046,7 +1048,7 @@ heim_ntlm_ntlmv2_key(const void *key, size_t len,
     HMAC_Init_ex(&c, key, len, EVP_md5(), NULL);
     {
 	struct ntlm_buf buf;
-	/* uppercase username and turn it inte ucs2-le */
+	/* uppercase username and turn it into ucs2-le */
 	ascii2ucs2le(username, 1, &buf);
 	HMAC_Update(&c, buf.data, buf.length);
 	free(buf.data);