From 4744636721d2e420f8bbe2d563f31b1f5e682229 Mon Sep 17 00:00:00 2001 From: "P.I.E. Security Team" Date: Thu, 18 Jun 2020 13:40:04 -0400 Subject: [PATCH] Language Improvements (#972) * Language Improvements https://github.com/paragonie/sodium_compat/pull/121 * Update ed25519_ref10.c --- .../crypto_core/ed25519/ref10/ed25519_ref10.c | 14 +++++++------- .../curve25519/ref10/x25519_ref10.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c index 61be72d6..e5199c09 100644 --- a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c +++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c @@ -1130,7 +1130,7 @@ int ge25519_has_small_order(const unsigned char s[32]) { CRYPTO_ALIGN(16) - static const unsigned char blacklist[][32] = { + static const unsigned char blocklist[][32] = { /* 0 (order 4) */ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1166,17 +1166,17 @@ ge25519_has_small_order(const unsigned char s[32]) unsigned int k; size_t i, j; - COMPILER_ASSERT(7 == sizeof blacklist / sizeof blacklist[0]); + COMPILER_ASSERT(7 == sizeof blocklist / sizeof blocklist[0]); for (j = 0; j < 31; j++) { - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { - c[i] |= s[j] ^ blacklist[i][j]; + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { + c[i] |= s[j] ^ blocklist[i][j]; } } - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { - c[i] |= (s[j] & 0x7f) ^ blacklist[i][j]; + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { + c[i] |= (s[j] & 0x7f) ^ blocklist[i][j]; } k = 0; - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { k |= (c[i] - 1); } return (int) ((k >> 8) & 1); diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c index 9eaf0235..d37db8ee 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c +++ b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c @@ -17,7 +17,7 @@ static int has_small_order(const unsigned char s[32]) { CRYPTO_ALIGN(16) - static const unsigned char blacklist[][32] = { + static const unsigned char blocklist[][32] = { /* 0 (order 4) */ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -53,17 +53,17 @@ has_small_order(const unsigned char s[32]) unsigned int k; size_t i, j; - COMPILER_ASSERT(7 == sizeof blacklist / sizeof blacklist[0]); + COMPILER_ASSERT(7 == sizeof blocklist / sizeof blocklist[0]); for (j = 0; j < 31; j++) { - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { - c[i] |= s[j] ^ blacklist[i][j]; + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { + c[i] |= s[j] ^ blocklist[i][j]; } } - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { - c[i] |= (s[j] & 0x7f) ^ blacklist[i][j]; + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { + c[i] |= (s[j] & 0x7f) ^ blocklist[i][j]; } k = 0; - for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) { + for (i = 0; i < sizeof blocklist / sizeof blocklist[0]; i++) { k |= (c[i] - 1); } return (int) ((k >> 8) & 1);