pluto: Fix for null-terminated XAuth secrets (as sent by Android 4).

diff --git a/src/pluto/plugins/xauth/xauth_default_verifier.c b/src/pluto/plugins/xauth/xauth_default_verifier.c
index 776f77134530768aacdc5c79fdab0ae8df326881..ca2e36aa056829bad8ccecef1d1492bdc50e836b 100644 (file)
--- a/src/pluto/plugins/xauth/xauth_default_verifier.c
+++ b/src/pluto/plugins/xauth/xauth_default_verifier.c
@@ -43,6 +43,13 @@ METHOD(xauth_verifier_t, verify_secret, bool,
        if (get_xauth_secret(user, server, &xauth_secret))
        {
                success = chunk_equals(secret, xauth_secret);
+
+               if (!success && secret.len && secret.ptr[secret.len - 1] == 0)
+               {       /* fix for null-terminated passwords (e.g. from Android 4) */
+                       secret.len--;
+                       success = chunk_equals(secret, xauth_secret);
+               }
+
                chunk_clear(&xauth_secret);
        }
        return success;