Commit 8ab0d50c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove duplicate test from health check. Fix memory leaks by uninstantiating 

DRBG before reinitialising it.
parent cb47a710

fips/rand/fips_drbg_selftest.c

+11 −18
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ static int fips_drbg_error_check(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td) 
		}

		

	dctx->iflags &= ~DRBG_FLAG_NOERR;



	if (!FIPS_drbg_uninstantiate(dctx))

		{

		FIPSerr(FIPS_F_FIPS_DRBG_ERROR_CHECK, FIPS_R_UNINSTANTIATE_ERROR);
@@ -617,28 +616,20 @@ static int fips_drbg_error_check(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td) 
		goto err;

		}



	/* Explicit reseed tests */



	/* Test explicit reseed with too large additional input */

	if (!do_drbg_init(dctx, td, &t))

		goto err;



	dctx->iflags |= DRBG_FLAG_NOERR;



	if (FIPS_drbg_reseed(dctx, td->adin, dctx->max_adin + 1) > 0)

	dctx->iflags &= ~DRBG_FLAG_NOERR;

	if (!FIPS_drbg_uninstantiate(dctx))

		{

		FIPSerr(FIPS_F_FIPS_DRBG_ERROR_CHECK, FIPS_R_ADDITIONAL_INPUT_ERROR_UNDETECTED);

		FIPSerr(FIPS_F_FIPS_DRBG_ERROR_CHECK, FIPS_R_UNINSTANTIATE_ERROR);

		goto err;

		}



	/* Test explicit reseed with entropy source failure */



	/* Check prediction resistance request fails if entropy source

	 * failure.

	 */



	t.entlen = 0;



	dctx->iflags |= DRBG_FLAG_NOERR;

	if (FIPS_drbg_generate(dctx, randout, td->katlen, 1,

				td->adin, td->adinlen))

		{
@@ -680,6 +671,13 @@ static int fips_drbg_error_check(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td) 
		goto err;

		}



	dctx->iflags &= ~DRBG_FLAG_NOERR;

	if (!FIPS_drbg_uninstantiate(dctx))

		{

		FIPSerr(FIPS_F_FIPS_DRBG_ERROR_CHECK, FIPS_R_UNINSTANTIATE_ERROR);

		goto err;

		}



	/* Explicit reseed tests */



	/* Test explicit reseed with too large additional input */
@@ -696,11 +694,6 @@ static int fips_drbg_error_check(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td) 


	/* Test explicit reseed with entropy source failure */



	if (!do_drbg_init(dctx, td, &t))

		goto err;



	dctx->iflags |= DRBG_FLAG_NOERR;



	t.entlen = 0;



	if (FIPS_drbg_reseed(dctx, td->adin, td->adinlen) > 0)