octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-05 13:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- xor swap doesn't work when you're swapping elements with themselves

Browse Source 
git-svn-id: http://phpseclib.svn.sourceforge.net/svnroot/phpseclib/trunk@35 21d32557-59b3-4da0-833f-c5933fad653e
This commit is contained in:
Jim Wigginton 2009-05-27 21:36:53 +00:00
parent c17f22ead9
commit ed39f723c9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpseclib/Crypt/RC4.php
View File

@ -55,7 +55,7 @@
* @author Jim Wigginton <terrafrost@php.net> * @author Jim Wigginton <terrafrost@php.net>
* @copyright MMVII Jim Wigginton * @copyright MMVII Jim Wigginton
* @license http://www.gnu.org/licenses/lgpl.txt * @license http://www.gnu.org/licenses/lgpl.txt
* @version $Id: RC4.php,v 1.6 2009-05-27 16:15:23 terrafrost Exp $ * @version $Id: RC4.php,v 1.7 2009-05-27 21:36:53 terrafrost Exp $
* @link http://phpseclib.sourceforge.net * @link http://phpseclib.sourceforge.net
*/ */
@ -220,9 +220,9 @@ class Crypt_RC4 {
$j = 0; $j = 0;
for ($i = 0; $i < 256; $i++) { for ($i = 0; $i < 256; $i++) {
$j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255; $j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
$keyStream[$i] ^= $keyStream[$j]; $temp = $keyStream[$i];
$keyStream[$j] ^= $keyStream[$i]; $keyStream[$i] = $keyStream[$j];
$keyStream[$i] ^= $keyStream[$j]; $keyStream[$j] = $temp;
} }
$this->encryptIndex = $this->decryptIndex = array(0, 0); $this->encryptIndex = $this->decryptIndex = array(0, 0);
@ -325,6 +325,10 @@ class Crypt_RC4 {
return $newText; return $newText;
} }
if ($this->encryptStream === false) {
$this->setKey($this->key);
}
switch ($mode) { switch ($mode) {
case CRYPT_RC4_ENCRYPT: case CRYPT_RC4_ENCRYPT:
$keyStream = $this->encryptStream; $keyStream = $this->encryptStream;
@ -335,17 +339,13 @@ class Crypt_RC4 {
list($i, $j) = $this->decryptIndex; list($i, $j) = $this->decryptIndex;
} }
if ($keyStream === false) {
$this->setKey($this->key);
}
$newText = ''; $newText = '';
for ($k = 0; $k < strlen($text); $k++) { for ($k = 0; $k < strlen($text); $k++) {
$i = ($i + 1) & 255; $i = ($i + 1) & 255;
$j = ($j + $keyStream[$i]) & 255; $j = ($j + $keyStream[$i]) & 255;
$keyStream[$i] ^= $keyStream[$j]; $temp = $keyStream[$i];
$keyStream[$j] ^= $keyStream[$i]; $keyStream[$i] = $keyStream[$j];
$keyStream[$i] ^= $keyStream[$j]; $keyStream[$j] = $temp;
$temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255]; $temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
$newText.= chr(ord($text[$k]) ^ $temp); $newText.= chr(ord($text[$k]) ^ $temp);
} }