From c190818f373c6bd0caa2fd720c0bf1cc6b8e7575 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 7 Mar 2007 20:40:21 +0000 Subject: [PATCH] 2007-03-07 Dan Williams Patch from Simon Geard (Gnome.org #394956) * src/nm-ap-security-wpa-psk.c - (real_write_supplicant_config): work with PSKs that may contain zeros in the binary format rather than treating it as a string git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2445 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/nm-ap-security-wpa-psk.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab587bd9cc..13ed281ca4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-07 Dan Williams + + Patch from Simon Geard (Gnome.org #394956) + * src/nm-ap-security-wpa-psk.c + - (real_write_supplicant_config): work with PSKs that may contain + zeros in the binary format rather than treating it as a string + 2007-03-02 Tambet Ingo * libnm-glib/nm-device-802-11-wireless.c diff --git a/src/nm-ap-security-wpa-psk.c b/src/nm-ap-security-wpa-psk.c index 8b92c2c63d..1c6e5092bc 100644 --- a/src/nm-ap-security-wpa-psk.c +++ b/src/nm-ap-security-wpa-psk.c @@ -165,7 +165,7 @@ real_write_supplicant_config (NMAPSecurity *instance, goto out; } - if (!nm_supplicant_config_add_option (config, "psk", bin_key, -1)) { + if (!nm_supplicant_config_add_option (config, "psk", bin_key, strlen (key) / 2)) { g_free (bin_key); goto out; }