Fix error messages for sodium_crypto_stream_xchacha20

And test them. Also adjust the constant check in the test so that
it actually runs.

Author: nikic

ext/sodium/libsodium.c

@@ -1503,15 +1503,15 @@ PHP_FUNCTION(sodium_crypto_stream_xchacha20)
 		RETURN_THROWS();
 	}
 	if (ciphertext_len <= 0 || ciphertext_len >= SIZE_MAX) {
-		zend_argument_error(sodium_exception_ce, 1, "length must be greater than 0");
+		zend_argument_error(sodium_exception_ce, 1, "must be greater than 0");
 		RETURN_THROWS();
 	}
 	if (nonce_len != crypto_stream_xchacha20_NONCEBYTES) {
-		zend_argument_error(sodium_exception_ce, 2, "nonce must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long");
+		zend_argument_error(sodium_exception_ce, 2, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long");
 		RETURN_THROWS();
 	}
 	if (key_len != crypto_stream_xchacha20_KEYBYTES) {
-		zend_argument_error(sodium_exception_ce, 3, "key must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
+		zend_argument_error(sodium_exception_ce, 3, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
 		RETURN_THROWS();
 	}
 	ciphertext = zend_string_checked_alloc((size_t) ciphertext_len, 0);
@@ -1545,11 +1545,11 @@ PHP_FUNCTION(sodium_crypto_stream_xchacha20_xor)
 		RETURN_THROWS();
 	}
 	if (nonce_len != crypto_stream_xchacha20_NONCEBYTES) {
-		zend_argument_error(sodium_exception_ce, 2, "nonce must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long");
+		zend_argument_error(sodium_exception_ce, 2, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long");
 		RETURN_THROWS();
 	}
 	if (key_len != crypto_stream_xchacha20_KEYBYTES) {
-		zend_argument_error(sodium_exception_ce, 3, "key must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
+		zend_argument_error(sodium_exception_ce, 3, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
 		RETURN_THROWS();
 	}
 	ciphertext_len = msg_len;

ext/sodium/tests/crypto_stream_xchacha20.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium stream
 --SKIPIF--
-<?php if (!extension_loaded("sodium") || !defined('CRYPTO_STREAM_XCHACHA20_KEYBYTES')) print "skip"; ?>
+<?php if (!extension_loaded("sodium") || !defined('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) print "skip"; ?>
 --FILE--
 <?php
 $nonce = random_bytes(SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES);
@@ -32,10 +32,30 @@ $stream6 = sodium_crypto_stream_xchacha20_xor($stream5, $nonce, $key);
 
 var_dump($stream6 === $stream);
 
+try {
+    sodium_crypto_stream_xchacha20(-1, $nonce, $key);
+} catch (SodiumException $ex) {
+    echo $ex->getMessage(), "\n";
+}
 try {
     sodium_crypto_stream_xchacha20($len, substr($nonce, 1), $key);
 } catch (SodiumException $ex) {
-    var_dump(true);
+    echo $ex->getMessage(), "\n";
+}
+try {
+    sodium_crypto_stream_xchacha20($len, $nonce, substr($key, 1));
+} catch (SodiumException $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    sodium_crypto_stream_xchacha20_xor($stream, substr($nonce, 1), $key);
+} catch (SodiumException $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    sodium_crypto_stream_xchacha20_xor($stream, $nonce, substr($key, 1));
+} catch (SodiumException $ex) {
+    echo $ex->getMessage(), "\n";
 }
 
 ?>
@@ -49,4 +69,8 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+sodium_crypto_stream_xchacha20(): Argument #1 ($length) must be greater than 0
+sodium_crypto_stream_xchacha20(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
+sodium_crypto_stream_xchacha20(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
+sodium_crypto_stream_xchacha20_xor(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
+sodium_crypto_stream_xchacha20_xor(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long