Skip to content

Commit 56a9998

Browse files
SammyKsgolemon
SammyK
authored and
sgolemon
committed
Fix constant references in error messages in ext/sodium
1 parent c22cda5 commit 56a9998

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎ext/sodium/libsodium.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ PHP_FUNCTION(sodium_crypto_box_open)
11831183
}
11841184
if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) {
11851185
zend_throw_exception(sodium_exception_ce,
1186-
"keypair size should be SODIUM_CRYPTO_BOX_KEYBYTES bytes",
1186+
"keypair size should be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes",
11871187
0);
11881188
return;
11891189
}
@@ -1259,7 +1259,7 @@ PHP_FUNCTION(sodium_crypto_box_seal_open)
12591259
}
12601260
if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) {
12611261
zend_throw_exception(sodium_exception_ce,
1262-
"keypair size should be SODIUM_CRYPTO_BOX_KEYBYTES bytes",
1262+
"keypair size should be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes",
12631263
0);
12641264
return;
12651265
}
@@ -2007,14 +2007,14 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_encrypt)
20072007
if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) {
20082008
zend_throw_exception(sodium_exception_ce,
20092009
"public nonce size should be "
2010-
"CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
2010+
"SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
20112011
0);
20122012
return;
20132013
}
20142014
if (secretkey_len != crypto_aead_aes256gcm_KEYBYTES) {
20152015
zend_throw_exception(sodium_exception_ce,
20162016
"secret key size should be "
2017-
"CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
2017+
"SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
20182018
0);
20192019
return;
20202020
}
@@ -2073,14 +2073,14 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_decrypt)
20732073
if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) {
20742074
zend_throw_exception(sodium_exception_ce,
20752075
"public nonce size should be "
2076-
"CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
2076+
"SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES bytes",
20772077
0);
20782078
return;
20792079
}
20802080
if (secretkey_len != crypto_aead_aes256gcm_KEYBYTES) {
20812081
zend_throw_exception(sodium_exception_ce,
20822082
"secret key size should be "
2083-
"CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
2083+
"SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES bytes",
20842084
0);
20852085
return;
20862086
}
@@ -2141,14 +2141,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_encrypt)
21412141
if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) {
21422142
zend_throw_exception(sodium_exception_ce,
21432143
"public nonce size should be "
2144-
"CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
2144+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
21452145
0);
21462146
return;
21472147
}
21482148
if (secretkey_len != crypto_aead_chacha20poly1305_KEYBYTES) {
21492149
zend_throw_exception(sodium_exception_ce,
21502150
"secret key size should be "
2151-
"CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
2151+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
21522152
0);
21532153
return;
21542154
}
@@ -2203,14 +2203,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_decrypt)
22032203
if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) {
22042204
zend_throw_exception(sodium_exception_ce,
22052205
"public nonce size should be "
2206-
"CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
2206+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES bytes",
22072207
0);
22082208
return;
22092209
}
22102210
if (secretkey_len != crypto_aead_chacha20poly1305_KEYBYTES) {
22112211
zend_throw_exception(sodium_exception_ce,
22122212
"secret key size should be "
2213-
"CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
2213+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES bytes",
22142214
0);
22152215
return;
22162216
}
@@ -2266,14 +2266,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_encrypt)
22662266
if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) {
22672267
zend_throw_exception(sodium_exception_ce,
22682268
"public nonce size should be "
2269-
"CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
2269+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
22702270
0);
22712271
return;
22722272
}
22732273
if (secretkey_len != crypto_aead_chacha20poly1305_IETF_KEYBYTES) {
22742274
zend_throw_exception(sodium_exception_ce,
22752275
"secret key size should be "
2276-
"CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
2276+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
22772277
0);
22782278
return;
22792279
}
@@ -2332,14 +2332,14 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_decrypt)
23322332
if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) {
23332333
zend_throw_exception(sodium_exception_ce,
23342334
"public nonce size should be "
2335-
"CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
2335+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES bytes",
23362336
0);
23372337
return;
23382338
}
23392339
if (secretkey_len != crypto_aead_chacha20poly1305_IETF_KEYBYTES) {
23402340
zend_throw_exception(sodium_exception_ce,
23412341
"secret key size should be "
2342-
"CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
2342+
"SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES bytes",
23432343
0);
23442344
return;
23452345
}
@@ -2401,14 +2401,14 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt)
24012401
if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) {
24022402
zend_throw_exception(sodium_exception_ce,
24032403
"public nonce size should be "
2404-
"CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
2404+
"SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
24052405
0);
24062406
return;
24072407
}
24082408
if (secretkey_len != crypto_aead_xchacha20poly1305_IETF_KEYBYTES) {
24092409
zend_throw_exception(sodium_exception_ce,
24102410
"secret key size should be "
2411-
"CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
2411+
"SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
24122412
0);
24132413
return;
24142414
}
@@ -2463,14 +2463,14 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt)
24632463
if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) {
24642464
zend_throw_exception(sodium_exception_ce,
24652465
"public nonce size should be "
2466-
"CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
2466+
"SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES bytes",
24672467
0);
24682468
return;
24692469
}
24702470
if (secretkey_len != crypto_aead_xchacha20poly1305_IETF_KEYBYTES) {
24712471
zend_throw_exception(sodium_exception_ce,
24722472
"secret key size should be "
2473-
"CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
2473+
"SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES bytes",
24742474
0);
24752475
return;
24762476
}
@@ -2578,7 +2578,7 @@ PHP_FUNCTION(sodium_crypto_scalarmult)
25782578
if (n_len != crypto_scalarmult_SCALARBYTES ||
25792579
p_len != crypto_scalarmult_BYTES) {
25802580
zend_throw_exception(sodium_exception_ce, "scalar and point must be "
2581-
"CRYPTO_SCALARMULT_SCALARBYTES bytes",
2581+
"SODIUM_CRYPTO_SCALARMULT_SCALARBYTES bytes",
25822582
0);
25832583
return;
25842584
}

0 commit comments

Comments
 (0)