From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 7 Jul 2014 09:12:30 +0000 (+0200)
Subject: xauth-pam: Add workaround for null-terminated passwords
X-Git-Tag: 5.2.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44870e531309de01bf1eb92976d5046ab6526fb0;p=thirdparty%2Fstrongswan.git

xauth-pam: Add workaround for null-terminated passwords

Fixes #631.
---

diff --git a/src/libcharon/plugins/xauth_pam/xauth_pam.c b/src/libcharon/plugins/xauth_pam/xauth_pam.c
index 1970146c0b..3414d2ec86 100644
--- a/src/libcharon/plugins/xauth_pam/xauth_pam.c
+++ b/src/libcharon/plugins/xauth_pam/xauth_pam.c
@@ -153,7 +153,12 @@ METHOD(xauth_method_t, process, status_t,
 				attr2string(user, sizeof(user), chunk);
 				break;
 			case XAUTH_USER_PASSWORD:
-				attr2string(pass, sizeof(pass), attr->get_chunk(attr));
+				chunk = attr->get_chunk(attr);
+				if (chunk.len && chunk.ptr[chunk.len - 1] == 0)
+				{	/* fix null-terminated passwords (Android etc.) */
+					chunk.len -= 1;
+				}
+				attr2string(pass, sizeof(pass), chunk);
 				break;
 			default:
 				break;