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

Merge branch 'master' into php5

Browse Source 
* master:
  typofixes - https://github.com/vlajos/misspell_fixer
This commit is contained in:
Andreas Fischer 2014-03-06 10:46:26 +01:00
commit e4d0906cee
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/AES.php
View File

@ -157,7 +157,7 @@ class Crypt_AES extends Crypt_Rijndael
* *
* - CRYPT_AES_MODE_OFB * - CRYPT_AES_MODE_OFB
* *
* If not explictly set, CRYPT_AES_MODE_CBC will be used. * If not explicitly set, CRYPT_AES_MODE_CBC will be used.
* *
* @see Crypt_Rijndael::Crypt_Rijndael() * @see Crypt_Rijndael::Crypt_Rijndael()
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()

10
phpseclib/Crypt/Base.php
View File

@ -279,7 +279,7 @@ class Crypt_Base
* $buffer bytes > $cfb_init_len than * $buffer bytes > $cfb_init_len than
* using the $ecb resource furthermore. * using the $ecb resource furthermore.
* *
* This value depends of the choosen cipher * This value depends of the chosen cipher
* and the time it would be needed for it's * and the time it would be needed for it's
* initialization [by mcrypt_generic_init()] * initialization [by mcrypt_generic_init()]
* which, typically, depends on the complexity * which, typically, depends on the complexity
@ -438,9 +438,9 @@ class Crypt_Base
* *
* - CRYPT_MODE_OFB * - CRYPT_MODE_OFB
* *
* (or the alias constants of the choosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...) * (or the alias constants of the chosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
* *
* If not explictly set, CRYPT_MODE_CBC will be used. * If not explicitly set, CRYPT_MODE_CBC will be used.
* *
* @param optional Integer $mode * @param optional Integer $mode
* @access public * @access public
@ -500,7 +500,7 @@ class Crypt_Base
/** /**
* Sets the initialization vector. (optional) * Sets the initialization vector. (optional)
* *
* SetIV is not required when CRYPT_MODE_ECB (or ie for AES: CRYPT_AES_MODE_ECB) is being used. If not explictly set, it'll be assumed * SetIV is not required when CRYPT_MODE_ECB (or ie for AES: CRYPT_AES_MODE_ECB) is being used. If not explicitly set, it'll be assumed
* to be all zero's. * to be all zero's.
* *
* Note: Could, but not must, extend by the child Crypt_* class * Note: Could, but not must, extend by the child Crypt_* class
@ -1446,7 +1446,7 @@ class Crypt_Base
* - each time on _setup(), after(!) _setupKey() * - each time on _setup(), after(!) _setupKey()
* *
* *
* This ensures that _setupInlineCrypt() has allways a * This ensures that _setupInlineCrypt() has always a
* full ready2go initializated internal cipher $engine state * full ready2go initializated internal cipher $engine state
* where, for example, the keys allready expanded, * where, for example, the keys allready expanded,
* keys/block_size calculated and such. * keys/block_size calculated and such.

2
phpseclib/Crypt/Blowfish.php
View File

@ -386,7 +386,7 @@ class Crypt_Blowfish extends Crypt_Base
* *
* - CRYPT_BLOWFISH_MODE_OFB * - CRYPT_BLOWFISH_MODE_OFB
* *
* If not explictly set, CRYPT_BLOWFISH_MODE_CBC will be used. * If not explicitly set, CRYPT_BLOWFISH_MODE_CBC will be used.
* *
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
* @param optional Integer $mode * @param optional Integer $mode

2
phpseclib/Crypt/DES.php
View File

@ -679,7 +679,7 @@ class Crypt_DES extends Crypt_Base
* *
* - CRYPT_DES_MODE_OFB * - CRYPT_DES_MODE_OFB
* *
* If not explictly set, CRYPT_DES_MODE_CBC will be used. * If not explicitly set, CRYPT_DES_MODE_CBC will be used.
* *
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
* @param optional Integer $mode * @param optional Integer $mode

2
phpseclib/Crypt/RC2.php
View File

@ -333,7 +333,7 @@ class Crypt_RC2 extends Crypt_Base
* *
* - CRYPT_RC2_MODE_OFB * - CRYPT_RC2_MODE_OFB
* *
* If not explictly set, CRYPT_RC2_MODE_CBC will be used. * If not explicitly set, CRYPT_RC2_MODE_CBC will be used.
* *
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
* @param optional Integer $mode * @param optional Integer $mode

2
phpseclib/Crypt/RC4.php
View File

@ -241,7 +241,7 @@ class Crypt_RC4 extends Crypt_Base
* Decrypts a message. * Decrypts a message.
* *
* $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)). * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
* Atleast if the continuous buffer is disabled. * At least if the continuous buffer is disabled.
* *
* @see Crypt_Base::encrypt() * @see Crypt_Base::encrypt()
* @see Crypt_RC4::_crypt() * @see Crypt_RC4::_crypt()

8
phpseclib/Crypt/RSA.php
View File

@ -104,7 +104,7 @@ define('CRYPT_RSA_ENCRYPTION_OAEP', 1);
* Use PKCS#1 padding. * Use PKCS#1 padding.
* *
* Although CRYPT_RSA_ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards * Although CRYPT_RSA_ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
* compatability with protocols (like SSH-1) written before OAEP's introduction. * compatibility with protocols (like SSH-1) written before OAEP's introduction.
*/ */
define('CRYPT_RSA_ENCRYPTION_PKCS1', 2); define('CRYPT_RSA_ENCRYPTION_PKCS1', 2);
/**#@-*/ /**#@-*/
@ -128,7 +128,7 @@ define('CRYPT_RSA_SIGNATURE_PSS', 1);
* Use the PKCS#1 scheme by default. * Use the PKCS#1 scheme by default.
* *
* Although CRYPT_RSA_SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards * Although CRYPT_RSA_SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
* compatability with protocols (like SSH-2) written before PSS's introduction. * compatibility with protocols (like SSH-2) written before PSS's introduction.
*/ */
define('CRYPT_RSA_SIGNATURE_PKCS1', 2); define('CRYPT_RSA_SIGNATURE_PKCS1', 2);
/**#@-*/ /**#@-*/
@ -2275,11 +2275,11 @@ class Crypt_RSA
* *
* See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}. * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
* *
* For compatability purposes, this function departs slightly from the description given in RFC3447. * For compatibility purposes, this function departs slightly from the description given in RFC3447.
* The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
* private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
* public key should have the second byte set to 2. In RFC3447 (PKCS#1 v2.1), the second byte is supposed * public key should have the second byte set to 2. In RFC3447 (PKCS#1 v2.1), the second byte is supposed
* to be 2 regardless of which key is used. For compatability purposes, we'll just check to make sure the * to be 2 regardless of which key is used. For compatibility purposes, we'll just check to make sure the
* second byte is 2 or less. If it is, we'll accept the decrypted string as valid. * second byte is 2 or less. If it is, we'll accept the decrypted string as valid.
* *
* As a consequence of this, a private key encrypted ciphertext produced with Crypt_RSA may not decrypt * As a consequence of this, a private key encrypted ciphertext produced with Crypt_RSA may not decrypt

6
phpseclib/Crypt/Rijndael.php
View File

@ -167,7 +167,7 @@ class Crypt_Rijndael extends Crypt_Base
* Mcrypt is useable for 128/192/256-bit $block_size/$key_size. For 160/224 not. * Mcrypt is useable for 128/192/256-bit $block_size/$key_size. For 160/224 not.
* Crypt_Rijndael determines automatically whether mcrypt is useable * Crypt_Rijndael determines automatically whether mcrypt is useable
* or not for the current $block_size/$key_size. * or not for the current $block_size/$key_size.
* In case of, $cipher_name_mcrypt will be set dynamicaly at run time accordingly. * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
* *
* @see Crypt_Base::cipher_name_mcrypt * @see Crypt_Base::cipher_name_mcrypt
* @see Crypt_Base::engine * @see Crypt_Base::engine
@ -693,7 +693,7 @@ class Crypt_Rijndael extends Crypt_Base
* *
* - CRYPT_RIJNDAEL_MODE_OFB * - CRYPT_RIJNDAEL_MODE_OFB
* *
* If not explictly set, CRYPT_RIJNDAEL_MODE_CBC will be used. * If not explicitly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
* *
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
* @param optional Integer $mode * @param optional Integer $mode
@ -755,7 +755,7 @@ class Crypt_Rijndael extends Crypt_Base
* you should not setKeyLength(160) or setKeyLength(224). * you should not setKeyLength(160) or setKeyLength(224).
* *
* Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
* the mcrypt php extention, even if available. * the mcrypt php extension, even if available.
* This results then in slower encryption. * This results then in slower encryption.
* *
* @access public * @access public

4
phpseclib/Crypt/TripleDES.php
View File

@ -180,7 +180,7 @@ class Crypt_TripleDES extends Crypt_DES
* *
* - CRYPT_DES_MODE_3CBC * - CRYPT_DES_MODE_3CBC
* *
* If not explictly set, CRYPT_DES_MODE_CBC will be used. * If not explicitly set, CRYPT_DES_MODE_CBC will be used.
* *
* @see Crypt_DES::Crypt_DES() * @see Crypt_DES::Crypt_DES()
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
@ -217,7 +217,7 @@ class Crypt_TripleDES extends Crypt_DES
/** /**
* Sets the initialization vector. (optional) * Sets the initialization vector. (optional)
* *
* SetIV is not required when CRYPT_DES_MODE_ECB is being used. If not explictly set, it'll be assumed * SetIV is not required when CRYPT_DES_MODE_ECB is being used. If not explicitly set, it'll be assumed
* to be all zero's. * to be all zero's.
* *
* @see Crypt_Base::setIV() * @see Crypt_Base::setIV()

2
phpseclib/Crypt/Twofish.php
View File

@ -465,7 +465,7 @@ class Crypt_Twofish extends Crypt_Base
* *
* - CRYPT_TWOFISH_MODE_OFB * - CRYPT_TWOFISH_MODE_OFB
* *
* If not explictly set, CRYPT_TWOFISH_MODE_CBC will be used. * If not explicitly set, CRYPT_TWOFISH_MODE_CBC will be used.
* *
* @see Crypt_Base::Crypt_Base() * @see Crypt_Base::Crypt_Base()
* @param optional Integer $mode * @param optional Integer $mode

2
phpseclib/File/X509.php
View File

@ -2531,7 +2531,7 @@ class File_X509
return strtolower(bin2hex(pack('N', $hash))); return strtolower(bin2hex(pack('N', $hash)));
} }
// Defaut is to return a string. // Default is to return a string.
$start = true; $start = true;
$output = ''; $output = '';
$asn1 = new File_ASN1(); $asn1 = new File_ASN1();

2
phpseclib/Math/BigInteger.php
View File

@ -3283,7 +3283,7 @@ class Math_BigInteger
* Checks a numer to see if it's prime * Checks a numer to see if it's prime
* *
* Assuming the $t parameter is not set, this function has an error rate of 2**-80. The main motivation for the * Assuming the $t parameter is not set, this function has an error rate of 2**-80. The main motivation for the
* $t parameter is distributability. Math_BigInteger::randomPrime() can be distributed accross multiple pageloads * $t parameter is distributability. Math_BigInteger::randomPrime() can be distributed across multiple pageloads
* on a website instead of just one. * on a website instead of just one.
* *
* @param optional Integer $t * @param optional Integer $t