octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0 

* 1.0:
  Replace ; with : in case statement.

Conflicts:
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH2.php
This commit is contained in:
Andreas Fischer 2015-05-03 14:13:56 +02:00
parent daaa931dc2 8893f8f53e
commit 661f3ce3b9
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) {
case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']);
case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
break;
default:
switch ($algorithm) {
@ -3012,7 +3012,7 @@ class X509
$algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
switch (true) {
case !$algorithm:
case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']);
case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
break;
default:
switch ($algorithm) {
@ -4091,7 +4091,7 @@ class X509
case $disposition == self::ATTR_APPEND:
$last = $key;
break;
case $disposition >= $n;
case $disposition >= $n:
$disposition -= $n;
break;
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
$dataCallback = false;
switch (true) {
case $mode & self::SOURCE_CALLBACK;
case $mode & self::SOURCE_CALLBACK:
if (!is_callable($data)) {
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':
$decryptKeyLength = 32; // eg. 128 / 8
break;
case 'none';
case 'none':
$decryptKeyLength = 0;
}
@ -1366,7 +1366,7 @@ class SSH2
case 'arcfour256':
$encryptKeyLength = 32;
break;
case 'none';
case 'none':
$encryptKeyLength = 0;
}
@ -1555,7 +1555,7 @@ class SSH2
case 'arcfour256':
$this->encrypt = new RC4();
break;
case 'none';
case 'none':
//$this->encrypt = new Null();
}
@ -1604,7 +1604,7 @@ class SSH2
case 'arcfour256':
$this->decrypt = new RC4();
break;
case 'none';
case 'none':
//$this->decrypt = new Null();
}