octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-09 23:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source 
* 2.0:
  Replace ; with : in case statement.
This commit is contained in:
Andreas Fischer 2015-05-03 14:14:02 +02:00
commit e40bbb12a3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/File/X509.php
View File

@ -2888,7 +2888,7 @@ class X509
switch (true) { switch (true) {
case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')): case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']); case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
break; break;
default: default:
switch ($algorithm) { switch ($algorithm) {
@ -3012,7 +3012,7 @@ class X509
$algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm'); $algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
switch (true) { switch (true) {
case !$algorithm: case !$algorithm:
case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']); case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
break; break;
default: default:
switch ($algorithm) { switch ($algorithm) {
@ -4091,7 +4091,7 @@ class X509
case $disposition == self::ATTR_APPEND: case $disposition == self::ATTR_APPEND:
$last = $key; $last = $key;
break; break;
case $disposition >= $n; case $disposition >= $n:
$disposition -= $n; $disposition -= $n;
break; break;
default: default:

2
phpseclib/Net/SFTP.php
View File

@ -1807,7 +1807,7 @@ class SFTP extends SSH2
// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3 // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
$dataCallback = false; $dataCallback = false;
switch (true) { switch (true) {
case $mode & self::SOURCE_CALLBACK; case $mode & self::SOURCE_CALLBACK:
if (!is_callable($data)) { if (!is_callable($data)) {
user_error("\$data should be is_callable() if you specify SOURCE_CALLBACK flag"); user_error("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
} }

8
phpseclib/Net/SSH2.php
View File

@ -1322,7 +1322,7 @@ class SSH2
case 'arcfour256': case 'arcfour256':
$decryptKeyLength = 32; // eg. 128 / 8 $decryptKeyLength = 32; // eg. 128 / 8
break; break;
case 'none'; case 'none':
$decryptKeyLength = 0; $decryptKeyLength = 0;
} }
@ -1366,7 +1366,7 @@ class SSH2
case 'arcfour256': case 'arcfour256':
$encryptKeyLength = 32; $encryptKeyLength = 32;
break; break;
case 'none'; case 'none':
$encryptKeyLength = 0; $encryptKeyLength = 0;
} }
@ -1555,7 +1555,7 @@ class SSH2
case 'arcfour256': case 'arcfour256':
$this->encrypt = new RC4(); $this->encrypt = new RC4();
break; break;
case 'none'; case 'none':
//$this->encrypt = new Null(); //$this->encrypt = new Null();
} }
@ -1604,7 +1604,7 @@ class SSH2
case 'arcfour256': case 'arcfour256':
$this->decrypt = new RC4(); $this->decrypt = new RC4();
break; break;
case 'none'; case 'none':
//$this->decrypt = new Null(); //$this->decrypt = new Null();
} }