summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-09-15 11:25:43 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-09-25 18:39:43 +0300
commiteef2d639f6f0a20b7768b3e521b0d0339957baeb (patch)
treef7793698ebe56eb2f86637339cf013da5dbc659a
parentb50bed1269be493f453c24de196bf89229abd2fd (diff)
test_{md5,sha{256,512_256}}: re-use of the context structure
The context structure declaration was moved outside the loops, it should help to re-use the same memory area which may trigger more potential bugs.
-rw-r--r--src/microhttpd/test_md5.c12
-rw-r--r--src/microhttpd/test_sha256.c12
-rw-r--r--src/microhttpd/test_sha512_256.c12
3 files changed, 18 insertions, 18 deletions
diff --git a/src/microhttpd/test_md5.c b/src/microhttpd/test_md5.c
index cf7ccbd1..13f9d46e 100644
--- a/src/microhttpd/test_md5.c
+++ b/src/microhttpd/test_md5.c
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- Copyright (C) 2019 Karlson2k (Evgeny Grin)
+ Copyright (C) 2019-2022 Evgeny Grin (Karlson2k)
This test tool is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -312,10 +312,10 @@ test1_str (void)
{
unsigned int i;
int num_failed = 0;
+ struct Md5Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Md5Ctx ctx;
uint8_t digest[MD5_DIGEST_SIZE];
MHD_MD5_init (&ctx);
@@ -334,10 +334,10 @@ test1_bin (void)
{
unsigned int i;
int num_failed = 0;
+ struct Md5Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Md5Ctx ctx;
uint8_t digest[MD5_DIGEST_SIZE];
MHD_MD5_init (&ctx);
@@ -356,10 +356,10 @@ test2_str (void)
{
unsigned int i;
int num_failed = 0;
+ struct Md5Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Md5Ctx ctx;
uint8_t digest[MD5_DIGEST_SIZE];
size_t part_s = data_units1[i].str_l.len / 4;
@@ -383,10 +383,10 @@ test2_bin (void)
{
unsigned int i;
int num_failed = 0;
+ struct Md5Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Md5Ctx ctx;
uint8_t digest[MD5_DIGEST_SIZE];
size_t part_s = data_units2[i].bin_l.len * 2 / 3;
@@ -414,6 +414,7 @@ test_unaligned (void)
unsigned int offset;
uint8_t *buf;
uint8_t *digest_buf;
+ struct Md5Ctx ctx;
const struct data_unit2 *const tdata = data_units2 + DATA_POS;
@@ -424,7 +425,6 @@ test_unaligned (void)
for (offset = MAX_OFFSET; offset >= 1; --offset)
{
- struct Md5Ctx ctx;
uint8_t *unaligned_digest;
uint8_t *unaligned_buf;
diff --git a/src/microhttpd/test_sha256.c b/src/microhttpd/test_sha256.c
index a44ceedc..f287afd6 100644
--- a/src/microhttpd/test_sha256.c
+++ b/src/microhttpd/test_sha256.c
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- Copyright (C) 2019 Karlson2k (Evgeny Grin)
+ Copyright (C) 2019-2022 Evgeny Grin (Karlson2k)
This test tool is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -339,10 +339,10 @@ test1_str (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha256Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Sha256Ctx ctx;
uint8_t digest[SHA256_DIGEST_SIZE];
MHD_SHA256_init (&ctx);
@@ -361,10 +361,10 @@ test1_bin (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha256Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Sha256Ctx ctx;
uint8_t digest[SHA256_DIGEST_SIZE];
MHD_SHA256_init (&ctx);
@@ -384,10 +384,10 @@ test2_str (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha256Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Sha256Ctx ctx;
uint8_t digest[SHA256_DIGEST_SIZE];
size_t part_s = data_units1[i].str_l.len / 4;
@@ -413,10 +413,10 @@ test2_bin (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha256Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Sha256Ctx ctx;
uint8_t digest[SHA256_DIGEST_SIZE];
size_t part_s = data_units2[i].bin_l.len * 2 / 3;
@@ -444,6 +444,7 @@ test_unaligned (void)
unsigned int offset;
uint8_t *buf;
uint8_t *digest_buf;
+ struct Sha256Ctx ctx;
const struct data_unit2 *const tdata = data_units2 + DATA_POS;
@@ -454,7 +455,6 @@ test_unaligned (void)
for (offset = MAX_OFFSET; offset >= 1; --offset)
{
- struct Sha256Ctx ctx;
uint8_t *unaligned_digest;
uint8_t *unaligned_buf;
diff --git a/src/microhttpd/test_sha512_256.c b/src/microhttpd/test_sha512_256.c
index e23ad256..81a505c0 100644
--- a/src/microhttpd/test_sha512_256.c
+++ b/src/microhttpd/test_sha512_256.c
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- Copyright (C) 2019-2022 Karlson2k (Evgeny Grin)
+ Copyright (C) 2019-2022 Evgeny Grin (Karlson2k)
This test tool is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -446,10 +446,10 @@ test1_str (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha512_256Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Sha512_256Ctx ctx;
uint8_t digest[SHA512_256_DIGEST_SIZE];
MHD_SHA512_256_init (&ctx);
@@ -468,10 +468,10 @@ test1_bin (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha512_256Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Sha512_256Ctx ctx;
uint8_t digest[SHA512_256_DIGEST_SIZE];
MHD_SHA512_256_init (&ctx);
@@ -491,10 +491,10 @@ test2_str (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha512_256Ctx ctx;
for (i = 0; i < units1_num; i++)
{
- struct Sha512_256Ctx ctx;
uint8_t digest[SHA512_256_DIGEST_SIZE];
size_t part_s = data_units1[i].str_l.len / 4;
@@ -520,10 +520,10 @@ test2_bin (void)
{
int num_failed = 0;
unsigned int i;
+ struct Sha512_256Ctx ctx;
for (i = 0; i < units2_num; i++)
{
- struct Sha512_256Ctx ctx;
uint8_t digest[SHA512_256_DIGEST_SIZE];
size_t part_s = data_units2[i].bin_l.len * 2 / 3;
@@ -551,6 +551,7 @@ test_unaligned (void)
unsigned int offset;
uint8_t *buf;
uint8_t *digest_buf;
+ struct Sha512_256Ctx ctx;
const struct data_unit2 *const tdata = data_units2 + DATA_POS;
@@ -561,7 +562,6 @@ test_unaligned (void)
for (offset = MAX_OFFSET; offset >= 1; --offset)
{
- struct Sha512_256Ctx ctx;
uint8_t *unaligned_digest;
uint8_t *unaligned_buf;