X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Futils%2FMWCryptRand.php;h=31a71c4af9f02c2792c6d489ccc1d305905761e5;hb=f0f69d49f4e010d4aa34e6b6bc26070f64673f5c;hp=0172974d6a4fcc7fea2712c26637d022a65a0d6e;hpb=49109173b4ad5fafb24688457e35b3c71d330346;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/utils/MWCryptRand.php b/includes/utils/MWCryptRand.php
index 0172974d6a..31a71c4af9 100644
--- a/includes/utils/MWCryptRand.php
+++ b/includes/utils/MWCryptRand.php
@@ -134,12 +134,10 @@ class MWCryptRand {
 		// It's mostly worthless but throw the wiki's id into the data for a little more variance
 		$state .= wfWikiID();
 
-		// If we have a secret key or proxy key set then throw it into the state as well
-		global $wgSecretKey, $wgProxyKey;
+		// If we have a secret key set then throw it into the state as well
+		global $wgSecretKey;
 		if ( $wgSecretKey ) {
 			$state .= $wgSecretKey;
-		} elseif ( $wgProxyKey ) {
-			$state .= $wgProxyKey;
 		}
 
 		return $state;
@@ -149,7 +147,7 @@ class MWCryptRand {
 	 * Randomly hash data while mixing in clock drift data for randomness
 	 *
 	 * @param string $data The data to randomly hash.
-	 * @return String The hashed bytes
+	 * @return string The hashed bytes
 	 * @author Tim Starling
 	 */
 	protected function driftHash( $data ) {
@@ -216,7 +214,7 @@ class MWCryptRand {
 	/**
 	 * Decide on the best acceptable hash algorithm we have available for hash()
 	 * @throws MWException
-	 * @return String A hash algorithm
+	 * @return string A hash algorithm
 	 */
 	protected function hashAlgo() {
 		if ( !is_null( $this->algo ) ) {
@@ -261,8 +259,8 @@ class MWCryptRand {
 	 * Generate an acceptably unstable one-way-hash of some text
 	 * making use of the best hash algorithm that we have available.
 	 *
-	 * @param $data string
-	 * @return String A raw hash of the data
+	 * @param string $data
+	 * @return string A raw hash of the data
 	 */
 	protected function hash( $data ) {
 		return hash( $this->hashAlgo(), $data, true );
@@ -272,9 +270,9 @@ class MWCryptRand {
 	 * Generate an acceptably unstable one-way-hmac of some text
 	 * making use of the best hash algorithm that we have available.
 	 *
-	 * @param $data string
-	 * @param $key string
-	 * @return String A raw hash of the data
+	 * @param string $data
+	 * @param string $key
+	 * @return string A raw hash of the data
 	 */
 	protected function hmac( $data, $key ) {
 		return hash_hmac( $this->hashAlgo(), $data, $key, true );
@@ -489,11 +487,11 @@ class MWCryptRand {
 	 * You can use MWCryptRand::wasStrong() if you wish to know if the source used
 	 * was cryptographically strong.
 	 *
-	 * @param int $bytes the number of bytes of random data to generate
+	 * @param int $bytes The number of bytes of random data to generate
 	 * @param bool $forceStrong Pass true if you want generate to prefer cryptographically
 	 *                          strong sources of entropy even if reading from them may steal
 	 *                          more entropy from the system than optimal.
-	 * @return String Raw binary random data
+	 * @return string Raw binary random data
 	 */
 	public static function generate( $bytes, $forceStrong = false ) {
 		return self::singleton()->realGenerate( $bytes, $forceStrong );
@@ -505,11 +503,11 @@ class MWCryptRand {
 	 * You can use MWCryptRand::wasStrong() if you wish to know if the source used
 	 * was cryptographically strong.
 	 *
-	 * @param int $chars the number of hex chars of random data to generate
+	 * @param int $chars The number of hex chars of random data to generate
 	 * @param bool $forceStrong Pass true if you want generate to prefer cryptographically
 	 *                          strong sources of entropy even if reading from them may steal
 	 *                          more entropy from the system than optimal.
-	 * @return String Hexadecimal random data
+	 * @return string Hexadecimal random data
 	 */
 	public static function generateHex( $chars, $forceStrong = false ) {
 		return self::singleton()->realGenerateHex( $chars, $forceStrong );