octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-06-02 08:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

SymmetricKey: refactor to simplify the code

Browse Source
This commit is contained in:
Takuya Sawada 2017-10-10 19:06:14 +09:00
parent 65cbc60918
commit 9e037309b9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpseclib/Crypt/Common/SymmetricKey.php
View File

@ -1128,14 +1128,14 @@ abstract class SymmetricKey
for ($i = 0; $i < $len; ++$i) {
$ciphertext .= ($c = $plaintext[$i] ^ $this->encryptBlock($iv));
$iv = substr($iv, 1, $this->block_size - 1) . $c;
$iv = substr($iv, 1) . $c;
}
if ($this->continuousBuffer) {
if ($len >= $this->block_size) {
$this->encryptIV = substr($ciphertext, -$this->block_size);
if ($len >= $block_size) {
$this->encryptIV = substr($ciphertext, -$block_size);
} else {
$this->encryptIV = substr($this->encryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
$this->encryptIV = substr($this->encryptIV, $len - $block_size) . substr($ciphertext, -$len);
}
}
break;
@ -1439,14 +1439,14 @@ abstract class SymmetricKey
for ($i = 0; $i < $len; ++$i) {
$plaintext .= $ciphertext[$i] ^ $this->encryptBlock($iv);
$iv = substr($iv, 1, $this->block_size - 1) . $ciphertext[$i];
$iv = substr($iv, 1) . $ciphertext[$i];
}
if ($this->continuousBuffer) {
if ($len >= $this->block_size) {
$this->decryptIV = substr($ciphertext, -$this->block_size);
if ($len >= $block_size) {
$this->decryptIV = substr($ciphertext, -$block_size);
} else {
$this->decryptIV = substr($this->decryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
$this->decryptIV = substr($this->decryptIV, $len - $block_size) . substr($ciphertext, -$len);
}
}
break;
@ -2571,7 +2571,7 @@ abstract class SymmetricKey
$in = $_iv;
'.$encrypt_block.'
$_ciphertext .= ($_c = $_text[$_i] ^ $in);
$_iv = substr($_iv, 1, '.$block_size.' - 1) . $_c;
$_iv = substr($_iv, 1) . $_c;
}
if ($this->continuousBuffer) {
@ -2593,7 +2593,7 @@ abstract class SymmetricKey
$in = $_iv;
'.$encrypt_block.'
$_plaintext .= $_text[$_i] ^ $in;
$_iv = substr($_iv, 1, '.$block_size.' - 1) . $_text[$_i];
$_iv = substr($_iv, 1) . $_text[$_i];
}
if ($this->continuousBuffer) {