com php-src: Fix constant references in error messages in ext/sodium: ext/sodium/libsodium.c
| From: | Sara Golemon | Date: | Tue, 29 Aug 2017 02:16:35 +0000 |
| Subject: | com php-src: Fix constant references in error messages in ext/sodium: ext/sodium/libsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99180@lists.php.net to get a copy of this message | ||
Commit: 56a999885a6e490aeb1cac210f8a095bf5899c07
Author: Sammy Kaye Powers <sammyk@sammykmedia.com> Wed, 23 Aug 2017 14:38:12 -0500
Committer: Sara Golemon <pollita@php.net> Mon, 28 Aug 2017 22:16:35 -0400
Parents: c22cda5999eaaaa50df0b7977f51853cbf1988a3
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56a999885a6e490aeb1cac210f8a095bf5899c07
Log:
Fix constant references in error messages in ext/sodium
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index 51171f2..6ed7b32 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -1183,7 +1183,7 @@ PHP_FUNCTION(sodium_crypto_box_open)
}
if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) {
zend_throw_exception(sodium_exception_ce,
- "keypair size should be SODIUM_CRYPTO_BOX_KEYBYTES bytes",
+ "keypair size should be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes",
0);
return;
}
@@ -1259,7 +1259,7 @@ PHP_FUNCTION(sodium_crypto_box_seal_open)
}
if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) {
zend_throw_exception(sodium_exception_ce,
- "keypair size should be SODIUM_CRYPTO_BOX_KEYBYTES bytes",
+ "keypair size should be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes",
0);
return;
}
@@ -2007,14 +2007,14 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_encrypt)
if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_aes256gcm_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
0);
return;
}
@@ -2073,14 +2073,14 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_decrypt)
if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_aes256gcm_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
0);
return;
}
@@ -2141,14 +2141,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_encrypt)
if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_chacha20poly1305_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
0);
return;
}
@@ -2203,14 +2203,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_decrypt)
if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_chacha20poly1305_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
0);
return;
}
@@ -2266,14 +2266,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_encrypt)
if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_chacha20poly1305_IETF_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
0);
return;
}
@@ -2332,14 +2332,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_decrypt)
if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_chacha20poly1305_IETF_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
0);
return;
}
@@ -2401,14 +2401,14 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt)
if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_xchacha20poly1305_IETF_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
0);
return;
}
@@ -2463,14 +2463,14 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt)
if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) {
zend_throw_exception(sodium_exception_ce,
"public nonce size should be "
- "CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
0);
return;
}
if (secretkey_len != crypto_aead_xchacha20poly1305_IETF_KEYBYTES) {
zend_throw_exception(sodium_exception_ce,
"secret key size should be "
- "CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
+ "SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
0);
return;
}
@@ -2578,7 +2578,7 @@ PHP_FUNCTION(sodium_crypto_scalarmult)
if (n_len != crypto_scalarmult_SCALARBYTES ||
p_len != crypto_scalarmult_BYTES) {
zend_throw_exception(sodium_exception_ce, "scalar and point must be "
- "CRYPTO_SCALARMULT_SCALARBYTES bytes",
+ "SODIUM_CRYPTO_SCALARMULT_SCALARBYTES bytes",
0);
return;
}