summaryrefslogtreecommitdiffstats
path: root/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-08 11:34:01 +0200
committerRemi Collet <remi@remirepo.net>2020-07-08 11:34:01 +0200
commit0b3f2de85e861e1095c04b1cc4b9d0f42df1b8f8 (patch)
tree7a8ba896e1a7b407afca96161d5bd255b68d8759 /php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
parent2ff3700079cf1eb155cb5ef086328d3b3b8fb68a (diff)
update to 1.0.19
Diffstat (limited to 'php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch')
-rw-r--r--php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
index 99dff49..e5f8d1f 100644
--- a/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
+++ b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
@@ -1,19 +1,18 @@
-diff -up Net_SSH2-1.0.17/SSH2.php.old Net_SSH2-1.0.17/SSH2.php
---- Net_SSH2-1.0.17/SSH2.php.old 2019-09-16 07:59:20.346172698 +0200
-+++ Net_SSH2-1.0.17/SSH2.php 2019-09-16 07:59:00.696254003 +0200
-@@ -2035,13 +2035,13 @@ class Net_SSH2
- break;
+diff -up Net_SSH2-1.0.19/SSH2.php.old Net_SSH2-1.0.19/SSH2.php
+--- Net_SSH2-1.0.19/SSH2.php.old 2020-07-08 11:32:38.947331135 +0200
++++ Net_SSH2-1.0.19/SSH2.php 2020-07-08 11:32:59.619256541 +0200
+@@ -2059,12 +2059,12 @@ class Net_SSH2
+ return new Crypt_Rijndael(CRYPT_RIJNDAEL_MODE_CTR);
case 'blowfish-cbc':
if (!class_exists('Crypt_Blowfish')) {
- include_once 'Crypt/Blowfish.php';
+ include_once 'Crypt/Blowfish-phpseclib.php';
}
return new Crypt_Blowfish();
- break;
case 'blowfish-ctr':
if (!class_exists('Crypt_Blowfish')) {
- include_once 'Crypt/Blowfish.php';
+ include_once 'Crypt/Blowfish-phpseclib.php';
}
return new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
- break;
+ case 'twofish128-cbc':