Convert more tests to framework (3304d578) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

test/bioprinttest.c

+102 −149

Changes for test/bioprinttest.c: 102 added lines, 149 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,8 +11,11 @@
		#include <string.h>
		#include <openssl/bio.h>
		#include "internal/numbers.h"
		#include "testutil.h"
		#include "test_main.h"
		#include "test_main_custom.h"

		#define nelem(x) (sizeof(x)/sizeof((x)[0]))
		#define nelem(x) (int)(sizeof(x) / sizeof((x)[0]))

		static int justprint = 0;

		@@ -89,64 +92,13 @@ static char *fpexpected[][5] = {
		/* 69 */ { "6.6667e+04", "66666.6667", "6.667e+04", "6.6667E+04", "6.667E+04" },
		};

		static void dofptest(int test, double val, char width, int prec, int fail)
		{
		char format[80], result[80];
		int i;

		for (i = 0; i < 5; i++) {
		char *fspec = NULL;
		switch (i) {
		case 0:
		fspec = "e";
		break;
		case 1:
		fspec = "f";
		break;
		case 2:
		fspec = "g";
		break;
		case 3:
		fspec = "E";
		break;
		case 4:
		fspec = "G";
		break;
		}

		if (prec >= 0)
		BIO_snprintf(format, sizeof(format), "%%%s.%d%s", width, prec,
		fspec);
		else
		BIO_snprintf(format, sizeof(format), "%%%s%s", width, fspec);
		BIO_snprintf(result, sizeof(result), format, val);

		if (justprint) {
		if (i == 0) {
		printf(" /* %3d */ { \"%s\"", test, result);
		} else {
		printf(", \"%s\"", result);
		}
		} else {
		if (strcmp(fpexpected[test][i], result) != 0) {
		printf("Test %d(%d) failed. Expected \"%s\". Got \"%s\". "
		"Format \"%s\"\n", test, i, fpexpected[test][i], result,
		format);
		*fail = 1;
		}
		}
		}
		if (justprint) {
		printf(" },\n");
		}
		}

		struct z_data_st {
		typedef struct z_data_st {
		size_t value;
		const char *format;
		const char *expected;
		};
		static struct z_data_st zu_data[] = {
		} z_data;

		static z_data zu_data[] = {
		{ SIZE_MAX, "%zu", (sizeof(size_t) == 4 ? "4294967295"
		: sizeof(size_t) == 8 ? "18446744073709551615"
		: "") },
		@@ -161,24 +113,24 @@ static struct z_data_st zu_data[] = {
		{ 0, "%zi", "0" },
		};

		static void dozutest(int test, const struct z_data_st data, int fail)
		static int test_zu(int i)
		{
		char bio_buf[80];
		const z_data *data = &zu_data[i];

		BIO_snprintf(bio_buf, sizeof(bio_buf) - 1, data->format, data->value);
		if (strcmp(bio_buf, data->expected) != 0) {
		printf("Test %d failed. Expected \"%s\". Got \"%s\". "
		"Format \"%s\"\n", test, data->expected, bio_buf, data->format);
		*fail = 1;
		}
		if (!TEST_str_eq(bio_buf, data->expected))
		return 0;
		return 1;
		}

		struct j_data_st {
		typedef struct j_data_st {
		uint64_t value;
		const char *format;
		const char *expected;
		};
		static struct j_data_st j_data[] = {
		} j_data;

		static j_data jf_data[] = {
		{ 0xffffffffffffffffU, "%ju", "18446744073709551615" },
		{ 0xffffffffffffffffU, "%jx", "ffffffffffffffff" },
		{ 0x8000000000000000U, "%ju", "9223372036854775808" },
		@@ -189,108 +141,109 @@ static struct j_data_st j_data[] = {
		{ 0x8000000000000000U, "%ji", "-9223372036854775808" },
		};

		static void dojtest(int test, const struct j_data_st data, int fail)
		static int test_j(int i)
		{
		const j_data *data = &jf_data[i];
		char bio_buf[80];

		BIO_snprintf(bio_buf, sizeof(bio_buf) - 1, data->format, data->value);
		if (strcmp(bio_buf, data->expected) != 0) {
		printf("Test %d failed. Expected \"%s\". Got \"%s\". "
		"Format \"%s\"\n", test, data->expected, bio_buf, data->format);
		*fail = 1;
		}
		if (!TEST_str_eq(bio_buf, data->expected))
		return 0;
		return 1;
		}

		int main(int argc, char **argv)
		{
		int test = 0;
		size_t i;
		int fail = 0;
		int prec = -1;
		char *width = "";
		const double frac = 2.0/3.0;
		char buf[80];

		if (argc == 2 && strcmp(argv[1], "-expected") == 0) {
		justprint = 1;
		}
		/* Precision and width. */
		typedef struct pw_st {
		int p;
		const char *w;
		} pw;

		CRYPTO_set_mem_debug(1);
		CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
		static pw pw_params[] = {
		{ 4, "" },
		{ 5, "" },
		{ 4, "12" },
		{ 5, "12" },
		{ 0, "" },
		{ -1, "" },
		{ 4, "08" }
		};

		/* Tests for floating point format specifiers */
		for (i = 0; i < 7; i++) {
		switch (i) {
		case 0:
		prec = 4;
		width = "";
		break;
		case 1:
		prec = 5;
		width = "";
		break;
		case 2:
		prec = 4;
		width = "12";
		break;
		case 3:
		prec = 5;
		width = "12";
		break;
		case 4:
		prec = 0;
		width = "";
		break;
		case 5:
		prec = -1;
		width = "";
		break;
		case 6:
		prec = 4;
		width = "08";
		break;
		}
		static int dofptest(int test, double val, const char *width, int prec)
		{
		static const char *fspecs[] = {
		"e", "f", "g", "E", "G"
		};
		char format[80], result[80];
		int ret = 1, i;

		dofptest(test++, 0.0, width, prec, &fail);
		dofptest(test++, 0.67, width, prec, &fail);
		dofptest(test++, frac, width, prec, &fail);
		dofptest(test++, frac / 1000, width, prec, &fail);
		dofptest(test++, frac / 10000, width, prec, &fail);
		dofptest(test++, 6.0 + frac, width, prec, &fail);
		dofptest(test++, 66.0 + frac, width, prec, &fail);
		dofptest(test++, 666.0 + frac, width, prec, &fail);
		dofptest(test++, 6666.0 + frac, width, prec, &fail);
		dofptest(test++, 66666.0 + frac, width, prec, &fail);
		}
		for (i = 0; i < nelem(fspecs); i++) {
		const char *fspec = fspecs[i];

		/* Test excessively big number. Should fail */
		if (BIO_snprintf(buf, sizeof(buf), "%f\n", 2 * (double)ULONG_MAX) != -1) {
		printf("Test %d failed. Unexpected success return from "
		"BIO_snprintf()\n", test);
		fail = 1;
		}
		if (prec >= 0)
		BIO_snprintf(format, sizeof(format), "%%%s.%d%s", width, prec,
		fspec);
		else
		BIO_snprintf(format, sizeof(format), "%%%s%s", width, fspec);
		BIO_snprintf(result, sizeof(result), format, val);

		for (i = 0; i < nelem(zu_data); i++) {
		dozutest(test++, &zu_data[i], &fail);
		if (justprint) {
		if (i == 0)
		printf(" /* %d */ { \"%s\"", test, result);
		else
		printf(", \"%s\"", result);
		} else if (!TEST_str_eq(fpexpected[test][i], result)) {
		TEST_info("test %d format=\|%s\| exp=\|%s\|, ret=\|%s\|",
		test, format, fpexpected[test][i], result);
		ret = 0;
		}

		for (i = 0; i < nelem(j_data); i++) {
		dojtest(test++, &j_data[i], &fail);
		}
		if (justprint)
		printf(" },\n");
		return ret;
		}

		#ifndef OPENSSL_NO_CRYPTO_MDEBUG
		if (CRYPTO_mem_leaks_fp(stderr) <= 0)
		return 1;
		# endif

		if (!justprint) {
		if (fail) {
		printf("FAIL\n");
		static int test_fp(int i)
		{
		static int t = 0;
		const double frac = 2.0 / 3.0;
		const pw *pwp = &pw_params[i];

		if (!TEST_true(dofptest(t++, 0.0, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 0.67, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, frac, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, frac / 1000, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, frac / 10000, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 6.0 + frac, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 66.0 + frac, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 666.0 + frac, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 6666.0 + frac, pwp->w, pwp->p))
		\|\| !TEST_true(dofptest(t++, 66666.0 + frac, pwp->w, pwp->p)))
		return 0;
		return 1;
		}
		printf ("PASS\n");
		}

		static int test_big(void)
		{
		char buf[80];

		/* Test excessively big number. Should fail */
		if (!TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
		"%f\n", 2 * (double)ULONG_MAX), -1))
		return 0;
		return 1;
		}


		int test_main(int argc, char **argv)
		{
		if (argc == 2 && strcmp(argv[1], "-expected") == 0)
		justprint = 1;

		ADD_TEST(test_big);
		ADD_ALL_TESTS(test_fp, nelem(pw_params));
		ADD_ALL_TESTS(test_zu, nelem(zu_data));
		ADD_ALL_TESTS(test_j, nelem(jf_data));

		return run_tests(argv[0]);
		}

test/build.info

+5 −5

Changes for test/build.info: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ IF[{- !$disabled{tests} -}]
		INCLUDE[mdc2test]=../include
		DEPEND[mdc2test]=../libcrypto

		SOURCE[randtest]=randtest.c
		SOURCE[randtest]=randtest.c testutil.c test_main.c
		INCLUDE[randtest]=../include
		DEPEND[randtest]=../libcrypto

		@@ -175,7 +175,7 @@ IF[{- !$disabled{tests} -}]
		INCLUDE[danetest]=../include
		DEPEND[danetest]=../libcrypto ../libssl

		SOURCE[constant_time_test]=constant_time_test.c
		SOURCE[constant_time_test]=constant_time_test.c testutil.c test_main.c
		INCLUDE[constant_time_test]=.. ../include
		DEPEND[constant_time_test]=../libcrypto

		@@ -264,8 +264,8 @@ IF[{- !$disabled{tests} -}]
		INCLUDE[asynciotest]=../include
		DEPEND[asynciotest]=../libcrypto ../libssl

		SOURCE[bioprinttest]=bioprinttest.c
		INCLUDE[bioprinttest]=../include
		SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
		INCLUDE[bioprinttest]=../ ../include
		DEPEND[bioprinttest]=../libcrypto

		SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
		@@ -311,7 +311,7 @@ IF[{- !$disabled{tests} -}]

		IF[{- $disabled{shared} -}]
		PROGRAMS_NO_INST=cipher_overhead_test
		SOURCE[cipher_overhead_test]=cipher_overhead_test.c
		SOURCE[cipher_overhead_test]=cipher_overhead_test.c testutil.c test_main.c
		INCLUDE[cipher_overhead_test]=.. ../include
		DEPEND[cipher_overhead_test]=../libcrypto ../libssl
		ENDIF

test/cipher_overhead_test.c

+15 −8

Changes for test/cipher_overhead_test.c: 15 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,13 +7,15 @@
		* https://www.openssl.org/source/license.html
		*/

		#include <stdio.h>
		#include "e_os.h"
		#include "testutil.h"
		#include "test_main.h"

		#include "../ssl/ssl_locl.h"

		int main(void)
		static int cipher_overhead(void)
		{
		int i, n = ssl3_num_ciphers();
		int ret = 1, i, n = ssl3_num_ciphers();
		const SSL_CIPHER *ciph;
		size_t mac, in, blk, ex;

		@@ -21,13 +23,18 @@ int main(void)
		ciph = ssl3_get_cipher(i);
		if (!ciph->min_dtls)
		continue;
		if (!ssl_cipher_get_overhead(ciph, &mac, &in, &blk, &ex)) {
		printf("Error getting overhead for %s\n", ciph->name);
		exit(1);
		if (!TEST_true(ssl_cipher_get_overhead(ciph, &mac, &in, &blk, &ex))) {
		TEST_info("Failed getting %s", ciph->name);
		ret = 0;
		} else {
		printf("Cipher %s: %"OSSLzu" %"OSSLzu" %"OSSLzu" %"OSSLzu"\n",
		TEST_info("Cipher %s: %"OSSLzu" %"OSSLzu" %"OSSLzu" %"OSSLzu,
		ciph->name, mac, in, blk, ex);
		}
		}
		exit(0);
		return ret;
		}

		void register_tests(void)
		{
		ADD_TEST(cipher_overhead);
		}

test/constant_time_test.c

+154 −256

File changed.

Preview size limit exceeded, changes collapsed.

test/randtest.c

+29 −64

Changes for test/randtest.c: 29 added lines, 64 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,33 +7,24 @@
		* https://www.openssl.org/source/license.html
		*/

		#include <stdio.h>
		#include <stdlib.h>
		#include <openssl/rand.h>

		#include "../e_os.h"
		#include "testutil.h"
		#include "test_main.h"

		/* some FIPS 140-1 random number test */
		/* some simple tests */

		int main(int argc, char **argv)
		static int fips_random_tests(void)
		{
		unsigned char buf[2500];
		int i, j, k, s, sign, nsign, err = 0;
		int i, j, k, s, sign, nsign, ret = 1;
		unsigned long n1;
		unsigned long n2[16];
		unsigned long runs[2][34];
		/*
		* double d;
		*/
		long d;

		i = RAND_bytes(buf, 2500);
		if (i <= 0) {
		printf("init failed, the rand method is not properly installed\n");
		err++;
		goto err;
		}
		if (!TEST_int_ge(RAND_bytes(buf, sizeof(buf)), 0))
		return 0;

		n1 = 0;
		for (i = 0; i < 16; i++)
		@@ -77,69 +68,43 @@ int main(int argc, char **argv)
		runs[sign][nsign - 1]++;

		/* test 1 */
		if (!((9654 < n1) && (n1 < 10346))) {
		printf("test 1 failed, X=%lu\n", n1);
		err++;
		if (!TEST_true(9654 < n1 && n1 < 10346)) {
		TEST_info("test 1 failed, X=%lu", n1);
		ret = 0;
		}
		printf("test 1 done\n");

		/* test 2 */
		d = 0;
		for (i = 0; i < 16; i++)
		d += n2[i] * n2[i];
		d = (d * 8) / 25 - 500000;
		if (!((103 < d) && (d < 5740))) {
		printf("test 2 failed, X=%ld.%02ld\n", d / 100L, d % 100L);
		err++;
		if (!TEST_true(103 < d && d < 5740)) {
		TEST_info("test 2 failed, X=%ld.%02ld", d / 100L, d % 100L);
		ret = 0;
		}
		printf("test 2 done\n");

		/* test 3 */
		for (i = 0; i < 2; i++) {
		if (!((2267 < runs[i][0]) && (runs[i][0] < 2733))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 1, runs[i][0]);
		err++;
		}
		if (!((1079 < runs[i][1]) && (runs[i][1] < 1421))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 2, runs[i][1]);
		err++;
		}
		if (!((502 < runs[i][2]) && (runs[i][2] < 748))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 3, runs[i][2]);
		err++;
		}
		if (!((223 < runs[i][3]) && (runs[i][3] < 402))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 4, runs[i][3]);
		err++;
		if (!TEST_true(2267 < runs[i][0] && runs[i][0] < 2733)
		\|\| !TEST_true(1079 < runs[i][1] && runs[i][1] < 1421)
		\|\| !TEST_true(502 < runs[i][2] && runs[i][2] < 748)
		\|\| !TEST_true(223 < runs[i][3] && runs[i][3] < 402)
		\|\| !TEST_true(90 < runs[i][4] && runs[i][4] < 223)
		\|\| !TEST_true(90 < runs[i][5] && runs[i][5] < 223)) {
		TEST_info("During run %d", i);
		ret = 0;
		}
		if (!((90 < runs[i][4]) && (runs[i][4] < 223))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 5, runs[i][4]);
		err++;
		}
		if (!((90 < runs[i][5]) && (runs[i][5] < 223))) {
		printf("test 3 failed, bit=%d run=%d num=%lu\n",
		i, 6, runs[i][5]);
		err++;
		}
		}
		printf("test 3 done\n");

		/* test 4 */
		if (runs[0][33] != 0) {
		printf("test 4 failed, bit=%d run=%d num=%lu\n", 0, 34, runs[0][33]);
		err++;
		}
		if (runs[1][33] != 0) {
		printf("test 4 failed, bit=%d run=%d num=%lu\n", 1, 34, runs[1][33]);
		err++;
		if (!TEST_int_eq(runs[0][33], 0)
		\|\| !TEST_int_eq(runs[1][33], 0))
		ret = 0;

		return ret;
		}
		printf("test 4 done\n");
		err:
		err = ((err) ? 1 : 0);
		EXIT(err);

		void register_tests(void)
		{
		ADD_TEST(fips_random_tests);
		}