Commit 1a58139a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

More function code correction.

parent a32f4770

fips-1.0/dh/fips_dh_gen.c

+2 −2
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB 


	if(FIPS_selftest_failed())

		{

		FIPSerr(FIPS_F_DH_GENERATE_PARAMETERS,FIPS_R_FIPS_SELFTEST_FAILED);

		FIPSerr(FIPS_F_DH_BUILTIN_GENPARAMS,FIPS_R_FIPS_SELFTEST_FAILED);

		return 0;

		}



	if (FIPS_mode() && (prime_len < OPENSSL_DH_FIPS_MIN_MODULUS_BITS))

		{

		DHerr(DH_F_GENERATE_PARAMETERS, DH_R_KEY_SIZE_TOO_SMALL);

		DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_KEY_SIZE_TOO_SMALL);

		goto err;

		}

fips-1.0/dh/fips_dh_key.c

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int generate_key(DH *dh) 
	ok=1;

err:

	if (ok != 1)

		DHerr(DH_F_DH_GENERATE_KEY,ERR_R_BN_LIB);

		DHerr(DH_F_GENERATE_KEY,ERR_R_BN_LIB);



	if ((pub_key != NULL)  && (dh->pub_key == NULL))  BN_free(pub_key);

	if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key);
@@ -203,7 +203,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 


	if (dh->priv_key == NULL)

		{

		DHerr(DH_F_DH_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);

		DHerr(DH_F_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);

		goto err;

		}
@@ -223,7 +223,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 


	if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont))

		{

		DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);

		DHerr(DH_F_COMPUTE_KEY,ERR_R_BN_LIB);

		goto err;

		}

fips-1.0/dsa/fips_dsa_gen.c

+2 −2
Original line number Diff line number Diff line
@@ -119,14 +119,14 @@ static int dsa_builtin_paramgen(DSA *ret, int bits, 


	if(FIPS_selftest_failed())

	    {

	    FIPSerr(FIPS_F_DSA_GENERATE_PARAMETERS,

	    FIPSerr(FIPS_F_DSA_BUILTIN_PARAMGEN,

		    FIPS_R_FIPS_SELFTEST_FAILED);

	    goto err;

	    }



	if (FIPS_mode() && (bits < OPENSSL_DSA_FIPS_MIN_MODULUS_BITS))

		{

		DSAerr(DSA_F_DSA_GENERATE_PARAMETERS, DSA_R_KEY_SIZE_TOO_SMALL);

		DSAerr(DSA_F_DSA_BUILTIN_PARAMGEN, DSA_R_KEY_SIZE_TOO_SMALL);

		goto err;

		}

fips-1.0/dsa/fips_dsa_key.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int fips_check_dsa(DSA *dsa) 
	if (!fips_pkey_signature_test(&pk, tbs, -1,

					NULL, 0, EVP_dss1(), 0, NULL))

		{

		FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);

		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);

		return 0;

		}

	return 1;

fips-1.0/dsa/fips_dsa_ossl.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, FIPS_DSA_SIZE_T dlen, DSA 


	if (FIPS_mode() && (BN_num_bits(dsa->p) < OPENSSL_DSA_FIPS_MIN_MODULUS_BITS))

		{

		DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_KEY_SIZE_TOO_SMALL);

		DSAerr(DSA_F_DSA_DO_SIGN, DSA_R_KEY_SIZE_TOO_SMALL);

		return NULL;

		}