Merge branch 'hotfix/zendframework/zendframework#6781-add-missing-has…

…h-algorithm-constants-for-salted-derivation-key'

Close zendframework/zendframework#6781

src/Key/Derivation/SaltedS2k.php

@@ -15,6 +15,7 @@
 class SaltedS2k
 {
     protected static $supportedMhashAlgos = array (
+        'adler32'    => MHASH_ADLER32,
         'md2'        => MHASH_MD2,
         'md4'        => MHASH_MD4,
         'md5'        => MHASH_MD5,
@@ -26,13 +27,21 @@ class SaltedS2k
         'ripemd128'  => MHASH_RIPEMD128,
         'ripemd256'  => MHASH_RIPEMD256,
         'ripemd320'  => MHASH_RIPEMD320,
-        'haval128,3' => MHASH_HAVAL128,
-        'haval160,3' => MHASH_HAVAL160,
-        'haval192,3' => MHASH_HAVAL192,
-        'haval224,3' => MHASH_HAVAL224,
-        'haval256,3' => MHASH_HAVAL256,
-        'tiger128,3' => MHASH_TIGER128,
-        'riger160,3' => MHASH_TIGER160,
+        'haval128,3' => MHASH_HAVAL128, // @deprecated use haval128 instead
+        'haval128'   => MHASH_HAVAL128,
+        'haval160,3' => MHASH_HAVAL160, // @deprecated use haval160 instead
+        'haval160'   => MHASH_HAVAL160,
+        'haval192,3' => MHASH_HAVAL192, // @deprecated use haval192 instead
+        'haval192'   => MHASH_HAVAL192,
+        'haval224,3' => MHASH_HAVAL224, // @deprecated use haval224 instead
+        'haval224'   => MHASH_HAVAL224,
+        'haval256,3' => MHASH_HAVAL256, // @deprecated use haval256 instead
+        'haval256'   => MHASH_HAVAL256,
+        'tiger'      => MHASH_TIGER,
+        'tiger128,3' => MHASH_TIGER128, // @deprecated use tiger128 instead
+        'tiger128'   => MHASH_TIGER128,
+        'tiger160,3' => MHASH_TIGER160, // @deprecated use tiger160 instead
+        'tiger160'   => MHASH_TIGER160,
         'whirpool'   => MHASH_WHIRLPOOL,
         'snefru256'  => MHASH_SNEFRU256,
         'gost'       => MHASH_GOST,