From: Jouni Malinen <j@w1.fi>
Date: Sat, 15 Feb 2014 10:06:35 +0000 (+0200)
Subject: Fix MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding
X-Git-Tag: hostap_2_2~854
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22dd2d7a987325faa089e65914c1602cad85f747;p=thirdparty%2Fhostap.git

Fix MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding

This fixes issues in using a password that includes a UTF-8 character
with three-byte encoding with EAP methods that use NtPasswordHash
(anything using MSCHAPv2 or LEAP).

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/crypto/ms_funcs.c b/src/crypto/ms_funcs.c
index b2bbab2b5..49a5c1c24 100644
--- a/src/crypto/ms_funcs.c
+++ b/src/crypto/ms_funcs.c
@@ -58,6 +58,7 @@ static int utf8_to_ucs2(const u8 *utf8_string, size_t utf8_string_len,
 				WPA_PUT_LE16(ucs2_buffer + j,
 					     ((c & 0xF) << 12) |
 					     ((c2 & 0x3F) << 6) | (c3 & 0x3F));
+				j += 2;
 			}
 		}
 	}