From 431853c84644c02e6bff1b325af5e94d3b1eacc6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Mar 2011 23:06:40 +0100 Subject: Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2 Autobuild-User: Jelmer Vernooij Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104 --- source4/heimdal/lib/ntlm/ntlm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/heimdal/lib/ntlm') diff --git a/source4/heimdal/lib/ntlm/ntlm.c b/source4/heimdal/lib/ntlm/ntlm.c index e401319ae0..6dad519d4a 100644 --- a/source4/heimdal/lib/ntlm/ntlm.c +++ b/source4/heimdal/lib/ntlm/ntlm.c @@ -289,7 +289,7 @@ ret_sec_string(krb5_storage *sp, int ucs2, struct sec_buffer *desc, char **s) CHECK(krb5_storage_seek(sp, desc->offset, SEEK_SET), desc->offset); CHECK(ret_string(sp, ucs2, desc->length, s), 0); out: - return ret; + return ret; } static krb5_error_code @@ -1129,7 +1129,7 @@ heim_ntlm_v1_base_session(void *key, size_t len, session->length = 0; return ENOMEM; } - + m = EVP_MD_CTX_create(); if (m == NULL) { heim_ntlm_free_buf(session); @@ -1796,3 +1796,4 @@ heim_ntlm_derive_ntlm2_sess(const unsigned char sessionkey[16], HMAC_Final(&c, derivedkey, &hmaclen); HMAC_CTX_cleanup(&c); } + -- cgit