Merge "Making missing old files not try to render a thumbnail"

[lhc/web/wiklou.git] / includes / utils / MWCryptHKDF.php

diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php
index 8610386..cc13679 100644 (file)
--- a/includes/utils/MWCryptHKDF.php
+++ b/includes/utils/MWCryptHKDF.php
@@ -99,7 +99,8 @@ class MWCryptHKDF {
 
 
        /**
-        * @param string $hash Name of hashing algorithm
+        * @param string $secretKeyMaterial
+        * @param string $algorithm Name of hashing algorithm
         * @param BagOStuff $cache
         * @param string|array $context Context to mix into HKDF context
         */
@@ -257,8 +258,8 @@ class MWCryptHKDF {
         * and the SKM (source key material) is the "data".
         *
         * @param string $hash The hashing function to use (e.g., sha256)
-        * @param string $ikm The input keying material
         * @param string $salt The salt to add to the ikm, to get the prk
+        * @param string $ikm The input keying material
         * @return string Binary string (pseudorandm key) used as input to HKDFExpand
         */
        private static function HKDFExtract( $hash, $salt, $ikm ) {