diff options
Diffstat (limited to 'php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch')
| -rw-r--r-- | php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch index 893222a..a8d9776 100644 --- a/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch +++ b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch @@ -1,16 +1,16 @@ -diff -up Net_SSH2-0.3.6/SSH2.php.orig Net_SSH2-0.3.6/SSH2.php ---- Net_SSH2-0.3.6/SSH2.php.orig 2014-02-26 18:06:35.698241870 +0100 -+++ Net_SSH2-0.3.6/SSH2.php 2014-02-26 18:17:42.433603190 +0100 -@@ -1060,7 +1060,7 @@ class Net_SSH2 +diff -up Net_SSH2-0.3.7/SSH2.php.orig Net_SSH2-0.3.7/SSH2.php +--- Net_SSH2-0.3.7/SSH2.php.orig 2014-07-07 17:36:06.047391436 +0200 ++++ Net_SSH2-0.3.7/SSH2.php 2014-07-07 17:38:56.852300410 +0200 +@@ -1147,7 +1147,7 @@ class Net_SSH2 array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc') ); } -- if (!$this->_is_includable('Crypt/Blowfish.php')) { -+ if (!$this->_is_includable('Crypt/Blowfish-phpseclib.php')) { +- if (phpseclib_resolve_include_path('Crypt/Blowfish.php') === false) { ++ if (phpseclib_resolve_include_path('Crypt/Blowfish-phpseclib.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('blowfish-ctr', 'blowfish-cbc') -@@ -1428,14 +1428,14 @@ class Net_SSH2 +@@ -1515,14 +1515,14 @@ class Net_SSH2 break; case 'blowfish-cbc': if (!class_exists('Crypt_Blowfish')) { @@ -27,7 +27,7 @@ diff -up Net_SSH2-0.3.6/SSH2.php.orig Net_SSH2-0.3.6/SSH2.php } $this->encrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR); $this->encrypt_block_size = 8; -@@ -1504,14 +1504,14 @@ class Net_SSH2 +@@ -1591,14 +1591,14 @@ class Net_SSH2 break; case 'blowfish-cbc': if (!class_exists('Crypt_Blowfish')) { |