aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/apps.c2
-rw-r--r--apps/ca.c2
-rw-r--r--apps/speed.c2
-rw-r--r--crypto/cryptlib.c4
-rw-r--r--crypto/x509v3/ext_dat.h2
-rw-r--r--test/constant_time_test.c8
-rw-r--r--test/dhtest.c2
-rw-r--r--test/ectest.c4
-rw-r--r--test/gost2814789test.c3
-rw-r--r--test/igetest.c8
-rw-r--r--test/testutil.c3
11 files changed, 19 insertions, 21 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 1b76dbf825..1e2970aa46 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2654,7 +2654,7 @@ int app_isdir(const char *name)
# if defined(UNICODE) || defined(_UNICODE)
size_t i, len_0 = strlen(name) + 1;
- if (len_0 > sizeof(FileData.cFileName) / sizeof(FileData.cFileName[0]))
+ if (len_0 > OSSL_NELEM(FileData.cFileName))
return -1;
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
diff --git a/apps/ca.c b/apps/ca.c
index 0b928728df..2f43a9bc7f 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2408,7 +2408,7 @@ static const char *crl_reasons[] = {
"CAkeyTime"
};
-#define NUM_REASONS (sizeof(crl_reasons) / sizeof(char *))
+#define NUM_REASONS OSSL_NELEM(crl_reasons)
/*
* Given revocation information convert to a DB string. The format of the
diff --git a/apps/speed.c b/apps/speed.c
index a5bd2658b9..7a694852dc 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2438,7 +2438,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
{
static int mblengths[] =
{ 8 * 1024, 2 * 8 * 1024, 4 * 8 * 1024, 8 * 8 * 1024, 8 * 16 * 1024 };
- int j, count, num = sizeof(lengths) / sizeof(lengths[0]);
+ int j, count, num = OSSL_NELEM(lengths);
const char *alg_name;
unsigned char *inp, *out, no_key[32], no_iv[16];
EVP_CIPHER_CTX ctx;
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index be4cdb0b20..3742ff2947 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -406,8 +406,8 @@ void OPENSSL_showfatal(const char *fmta, ...)
} while (0);
va_start(ap, fmta);
- _vsntprintf(buf, sizeof(buf) / sizeof(TCHAR) - 1, fmt, ap);
- buf[sizeof(buf) / sizeof(TCHAR) - 1] = _T('\0');
+ _vsntprintf(buf, OSSL_NELEM(buf) - 1, fmt, ap);
+ buf[OSSL_NELEM(buf) - 1] = _T('\0');
va_end(ap);
# if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h
index 4e0fe92ffc..d43c86c65f 100644
--- a/crypto/x509v3/ext_dat.h
+++ b/crypto/x509v3/ext_dat.h
@@ -131,4 +131,4 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
/* Number of standard extensions */
-#define STANDARD_EXTENSION_COUNT (sizeof(standard_exts)/sizeof(X509V3_EXT_METHOD *))
+#define STANDARD_EXTENSION_COUNT OSSL_NELEM(standard_exts)
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index d313d0c7a9..bdb270209e 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -231,12 +231,12 @@ int main(int argc, char *argv[])
int num_failed = 0, num_all = 0;
fprintf(stdout, "Testing constant time operations...\n");
- for (i = 0; i < sizeof(test_values) / sizeof(int); ++i) {
+ for (i = 0; i < OSSL_NELEM(test_values); ++i) {
a = test_values[i];
num_failed += test_is_zero(a);
num_failed += test_is_zero_8(a);
num_all += 2;
- for (j = 0; j < sizeof(test_values) / sizeof(int); ++j) {
+ for (j = 0; j < OSSL_NELEM(test_values); ++j) {
b = test_values[j];
num_failed += test_binary_op(&constant_time_lt,
"constant_time_lt", a, b, a < b);
@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
}
}
- for (i = 0; i < sizeof(signed_test_values) / sizeof(int); ++i) {
+ for (i = 0; i < OSSL_NELEM(signed_test_values); ++i) {
c = signed_test_values[i];
- for (j = 0; j < sizeof(signed_test_values) / sizeof(int); ++j) {
+ for (j = 0; j < OSSL_NELEM(signed_test_values); ++j) {
d = signed_test_values[j];
num_failed += test_select_int(c, d);
num_failed += test_eq_int(c, d);
diff --git a/test/dhtest.c b/test/dhtest.c
index 621fcba506..7e46166eeb 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -485,7 +485,7 @@ static const rfc5114_td rfctd[] = {
static int run_rfc5114_tests(void)
{
int i;
- for (i = 0; i < (int)(sizeof(rfctd) / sizeof(rfc5114_td)); i++) {
+ for (i = 0; i < (int)OSSL_NELEM(rfctd); i++) {
DH *dhA, *dhB;
unsigned char *Z1 = NULL, *Z2 = NULL;
const rfc5114_td *td = rfctd + i;
diff --git a/test/ectest.c b/test/ectest.c
index 7320d3dfe4..4b15708020 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1628,9 +1628,7 @@ static void nistp_tests()
{
unsigned i;
- for (i = 0;
- i < sizeof(nistp_tests_params) / sizeof(struct nistp_test_params);
- i++) {
+ for (i = 0; i < OSSL_NELEM(nistp_tests_params); i++) {
nistp_single_test(&nistp_tests_params[i]);
}
}
diff --git a/test/gost2814789test.c b/test/gost2814789test.c
index 8384d66bd0..4569249e9a 100644
--- a/test/gost2814789test.c
+++ b/test/gost2814789test.c
@@ -26,6 +26,7 @@ int main(int argc, char *argv[])
# include <openssl/evp.h>
# include <openssl/hmac.h>
# include <openssl/obj_mac.h>
+# include "e_os.h"
# define CCGOST_ID "gost"
@@ -1311,7 +1312,7 @@ int main(int argc, char *argv[])
}
/* Test cases */
- for (t = 0; t < sizeof(tcs) / sizeof(tcs[0]); t++) {
+ for (t = 0; t < OSSL_NELEM(tcs); t++) {
if (NULL == tcs[t].szDerive) {
continue;
}
diff --git a/test/igetest.c b/test/igetest.c
index 96e98845e6..9c80c856e1 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -55,6 +55,7 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
+#include "e_os.h"
#define TEST_SIZE 128
#define BIG_TEST_SIZE 10240
@@ -191,8 +192,7 @@ static int run_test_vectors(void)
unsigned int n;
int errs = 0;
- for (n = 0; n < sizeof(ige_test_vectors) / sizeof(ige_test_vectors[0]);
- ++n) {
+ for (n = 0; n < OSSL_NELEM(ige_test_vectors); ++n) {
const struct ige_test *const v = &ige_test_vectors[n];
AES_KEY key;
unsigned char buf[MAX_VECTOR_SIZE];
@@ -235,9 +235,7 @@ static int run_test_vectors(void)
}
}
- for (n = 0;
- n < sizeof(bi_ige_test_vectors) / sizeof(bi_ige_test_vectors[0]);
- ++n) {
+ for (n = 0; n < OSSL_NELEM(bi_ige_test_vectors); ++n) {
const struct bi_ige_test *const v = &bi_ige_test_vectors[n];
AES_KEY key1;
AES_KEY key2;
diff --git a/test/testutil.c b/test/testutil.c
index 05ed589f74..70087d3ef0 100644
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -61,6 +61,7 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
+#include "e_os.h"
/*
* Declares the structures needed to register each test case function.
@@ -75,7 +76,7 @@ static int num_tests = 0;
void add_test(const char *test_case_name, int (*test_fn) ())
{
- assert(num_tests != (sizeof(all_tests) / sizeof(all_tests)[0]));
+ assert(num_tests != OSSL_NELEM(all_tests));
all_tests[num_tests].test_case_name = test_case_name;
all_tests[num_tests].test_fn = test_fn;
++num_tests;
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-14 06:54:34 +0000