From bb1c4a6542e957379b606ddff38f5c84270d62bc Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Thu, 22 Aug 2013 15:10:59 -0700 Subject: Revert changes to phpseclib to previous commit Michael Hamann commented in pull request #306 that phpseclib has not been adopted by the DokuWiki project. Therefore, the changes made to reduce the CodeSniffer violations should be reverted and the local copy of phpseclib should be excluded from CS checks. This commit reverts the previous changes and adds the appropriate exclusion rule. --- inc/phpseclib/Crypt_Hash.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc/phpseclib/Crypt_Hash.php') diff --git a/inc/phpseclib/Crypt_Hash.php b/inc/phpseclib/Crypt_Hash.php index eaa2da239..840fcd508 100644 --- a/inc/phpseclib/Crypt_Hash.php +++ b/inc/phpseclib/Crypt_Hash.php @@ -13,7 +13,7 @@ * * PHP versions 4 and 5 * - * {@internal The variable names are the same as those in + * {@internal The variable names are the same as those in * {@link http://tools.ietf.org/html/rfc2104#section-2 RFC2104}.}} * * Here's a short example of how to use this library: @@ -35,10 +35,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -567,11 +567,11 @@ class Crypt_Hash { if (!isset($k)) { // Initialize variables $init384 = array( // initial values for SHA384 - 'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939', + 'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939', '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4' ); $init512 = array( // initial values for SHA512 - '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1', + '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1', '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179' ); -- cgit v1.2.3