From a1c152d3af60f657569dd170bc3ba110609c5ea5 Mon Sep 17 00:00:00 2001 From: Heiko Hund Date: Mon, 29 Aug 2011 13:30:50 +0000 Subject: [PATCH] send credentials to openvpn in UTF-8 encoding --- openvpn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openvpn.c b/openvpn.c index 6fbc00d..f9392f2 100644 --- a/openvpn.c +++ b/openvpn.c @@ -228,13 +228,13 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) username_len = GetDlgItemText(hwndDlg, ID_EDT_AUTH_USER, buf, _tsizeof(buf)); if (username_len == 0) return TRUE; - length = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, buf, -1, cmd + 17, sizeof(cmd) - 17, "_", NULL); + length = WideCharToMultiByte(CP_UTF8, 0, buf, -1, cmd + 17, sizeof(cmd) - 17, NULL, NULL); memcpy(cmd + length + 16, "\"\0", 2); ManagementCommand(c, cmd, NULL, regular); memcpy(cmd, "password", 8); GetDlgItemText(hwndDlg, ID_EDT_AUTH_PASS, buf, _tsizeof(buf)); - length = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, buf, -1, cmd + 17, sizeof(cmd) - 17, "_", NULL); + length = WideCharToMultiByte(CP_UTF8, 0, buf, -1, cmd + 17, sizeof(cmd) - 17, NULL, NULL); memcpy(cmd + length + 16, "\"\0", 2); ManagementCommand(c, cmd, NULL, regular); @@ -291,7 +291,7 @@ PrivKeyPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { case IDOK: GetDlgItemText(hwndDlg, ID_EDT_PASSPHRASE, buf, _tsizeof(buf)); - length = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, buf, -1, cmd + 24, sizeof(cmd) - 24, "_", NULL); + length = WideCharToMultiByte(CP_UTF8, 0, buf, -1, cmd + 24, sizeof(cmd) - 24, NULL, NULL); memcpy(cmd + length + 23, "\"\0", 2); ManagementCommand(c, cmd, NULL, regular);