From a33bc87e8319e25cb870aee3867d7dc1ea53f4fe Mon Sep 17 00:00:00 2001 From: Jim Wigginton Date: Tue, 27 Apr 2010 21:29:36 +0000 Subject: [PATCH] - SSH servers whose identification string had trailing spaces wouldn't calculate the exchange hash correctly (thanks voxo!) git-svn-id: http://phpseclib.svn.sourceforge.net/svnroot/phpseclib/trunk@107 21d32557-59b3-4da0-833f-c5933fad653e --- phpseclib/Net/SSH2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index b4140006..74049332 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -60,7 +60,7 @@ * @author Jim Wigginton * @copyright MMVII Jim Wigginton * @license http://www.gnu.org/licenses/lgpl.txt - * @version $Id: SSH2.php,v 1.45 2010-04-25 14:19:43 terrafrost Exp $ + * @version $Id: SSH2.php,v 1.46 2010-04-27 21:29:36 terrafrost Exp $ * @link http://phpseclib.sourceforge.net */ @@ -691,7 +691,7 @@ class Net_SSH2 { } } - $this->server_identifier = trim($temp); + $this->server_identifier = trim($temp, "\r\n"); if (!empty($extra)) { $this->errors[] = utf8_decode($extra); }