Commit 62dd6f16 authored by Richard Levitte's avatar Richard Levitte
Browse files

The #else part of the conditionals have two statements, so they need 

to be surrounded with braces, or the surrounding if..else will fail
miserably in case the #else part is compiled.
parent 6aba658c

crypto/ec/ecp_nist.c

+6 −0
Original line number Diff line number Diff line
@@ -154,26 +154,32 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p, 
	if (BN_ucmp(BN_get0_nist_prime_192(), p) == 0)

		group->field_mod_func = BN_nist_mod_192;

	else if (BN_ucmp(BN_get0_nist_prime_224(), p) == 0)

		{

#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)

		group->field_mod_func = BN_nist_mod_224;

#else

		ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);

		goto err;

#endif

		}

	else if (BN_ucmp(BN_get0_nist_prime_256(), p) == 0)

		{

#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)

		group->field_mod_func = BN_nist_mod_256;

#else

		ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);

		goto err;

#endif

		}

	else if (BN_ucmp(BN_get0_nist_prime_384(), p) == 0)

		{

#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)

		group->field_mod_func = BN_nist_mod_384;

#else

		ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);

		goto err;

#endif

		}

	else if (BN_ucmp(BN_get0_nist_prime_521(), p) == 0)

		/* this one works in the NO_32_BIT_TYPE case */

		group->field_mod_func = BN_nist_mod_521;