From: Andrey Andreev <narf@devilix.net>
Date: Fri, 7 Jul 2017 10:01:09 +0000 (+0300)
Subject: Add missing NEWS entry, update UPGRADING
X-Git-Tag: php-7.2.0beta1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce4e07e37d09a71b6450de5099506fed29e15f13;p=php

Add missing NEWS entry, update UPGRADING

This was done back in January, but never noted in the NEWS file.
References:

https://github.com/php/php-src/pull/2312
https://github.com/php/php-src/pull/2321
---

diff --git a/NEWS b/NEWS
index f5664f5a72..275e3b8650 100644
--- a/NEWS
+++ b/NEWS
@@ -235,6 +235,8 @@ PHP                                                                        NEWS
   . Fixed bug #73961 (environmental build dependency in hash sha3 source).
     (krakjoe)
   . Changed HashContext from resource to object. (Rouven Weßling, Sara)
+  . Disallowed usage of non-cryptographic hash functions with HMAC and PBKDF2.
+    (Andrey Andreev, Nikita)
 
 - intl:
   . Fixed bug #74433 (wrong reflection for Normalizer methods). (villfa)
diff --git a/UPGRADING b/UPGRADING
index 9813574a18..56a07bba28 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -49,8 +49,8 @@ PHP 7.2 UPGRADE NOTES
     example `bcmod('4', '3.5')` now returns '0.5' instead of '1'.
 
 - Hash:
-  . The hash_hmac(), hash_hmac_file() and hash_pbkdf2() functions no longer
-    accept non-cryptographic hashes.
+  . The hash_hmac(), hash_hmac_file(), hash_pbkdf2() and hash_init() (with
+    HASH_HMAC) functions no longer accept non-cryptographic hashes.
 
 - JSON
   . The json_decode() option JSON_OBJECT_AS_ARRAY is used if the second