blake2: backport changes to blake2s