]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Fri, 21 Jul 2017 20:27:34 +0000 (22:27 +0200)
committerAnatol Belski <ab@php.net>
Fri, 21 Jul 2017 20:27:34 +0000 (22:27 +0200)
* PHP-7.2:
  remove casts and ensure no out of bounds access
  sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key()


Trivial merge