]> granicus.if.org Git - php/commit
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)
commit7a8c047c234e4e3ecb030aedb1f7ab2f139321ff
treece95710c94f60bc4921b93bfa7ae89dd60f69921
parent07e8bdd8c2bc6a88ab54d41b3ebd3685cb421257
parent7ec8b8d49f42e6edf520324b202c5754cd6d9e90
Merge branch 'PHP-7.2'

* PHP-7.2:
  remove casts and ensure no out of bounds access
  sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key()