From: Anatol Belski <ab@php.net>
Date: Fri, 21 Jul 2017 20:27:34 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1847^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a8c047c234e4e3ecb030aedb1f7ab2f139321ff;p=php

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()
---

7a8c047c234e4e3ecb030aedb1f7ab2f139321ff