diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-26 19:35:52 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-26 19:46:38 +0200 |
| commit | 243321b4bbe273cf3a9105ca132caa2b53e2f263 (patch) | |
| tree | c8588a032720412a9a510d4045d6ca6e5c961ee7 /source4/heimdal/lib/ntlm | |
| parent | 455f5c043d1416136a16a0bb6e463d855a913409 (diff) | |
| download | samba-243321b4bbe273cf3a9105ca132caa2b53e2f263.tar.gz samba-243321b4bbe273cf3a9105ca132caa2b53e2f263.tar.bz2 samba-243321b4bbe273cf3a9105ca132caa2b53e2f263.zip | |
heimdal: import heimdal's trunk svn rev 23697 + lorikeet-heimdal patches
This is based on f56a3b1846c7d462542f2e9527f4d0ed8a34748d in my heimdal-wip repo.
metze
(This used to be commit 467a1f2163a63cdf1a4c83a69473db50e8794f53)
Diffstat (limited to 'source4/heimdal/lib/ntlm')
| -rw-r--r-- | source4/heimdal/lib/ntlm/heimntlm.h | 2 | ||||
| -rw-r--r-- | source4/heimdal/lib/ntlm/ntlm.c | 8 |
2 files changed, 6 insertions, 4 deletions
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); |