octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-17 02:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2022-01-29 07:40:37 -06:00
parent 1017120fa9
commit 56ed69fbe7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ abstract class SymmetricKey
* @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt() * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
* @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt() * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
*/ */
const MODE_CFB8 = 6; const MODE_CFB8 = 7;
/** /**
* Encrypt / decrypt using the Output Feedback mode (8bit) * Encrypt / decrypt using the Output Feedback mode (8bit)
* *
@ -109,7 +109,7 @@ abstract class SymmetricKey
* @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt() * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
* @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt() * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
*/ */
const MODE_OFB8 = 7; const MODE_OFB8 = 8;
/** /**
* Encrypt / decrypt using the Output Feedback mode. * Encrypt / decrypt using the Output Feedback mode.
* *
@ -3054,7 +3054,7 @@ abstract class SymmetricKey
$encrypt = $init_encrypt . ' $encrypt = $init_encrypt . '
$_ciphertext = ""; $_ciphertext = "";
$_len = strlen($_text); $_len = strlen($_text);
$_iv = $self->encryptIV; $_iv = $this->encryptIV;
for ($_i = 0; $_i < $_len; ++$_i) { for ($_i = 0; $_i < $_len; ++$_i) {
$in = $_iv; $in = $_iv;
@ -3063,8 +3063,8 @@ abstract class SymmetricKey
$_iv = substr($_iv, 1) . $in[0]; $_iv = substr($_iv, 1) . $in[0];
} }
if ($self->continuousBuffer) { if ($this->continuousBuffer) {
$self->encryptIV = $_iv; $this->encryptIV = $_iv;
} }
return $_ciphertext; return $_ciphertext;
@ -3072,7 +3072,7 @@ abstract class SymmetricKey
$decrypt = $init_encrypt . ' $decrypt = $init_encrypt . '
$_plaintext = ""; $_plaintext = "";
$_len = strlen($_text); $_len = strlen($_text);
$_iv = $self->decryptIV; $_iv = $this->decryptIV;
for ($_i = 0; $_i < $_len; ++$_i) { for ($_i = 0; $_i < $_len; ++$_i) {
$in = $_iv; $in = $_iv;
@ -3081,8 +3081,8 @@ abstract class SymmetricKey
$_iv = substr($_iv, 1) . $in[0]; $_iv = substr($_iv, 1) . $in[0];
} }
if ($self->continuousBuffer) { if ($this->continuousBuffer) {
$self->decryptIV = $_iv; $this->decryptIV = $_iv;
} }
return $_plaintext; return $_plaintext;