Fix duplicate error number.

[openssl.git] / crypto / ec / ecp_nist.c

diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index ef2dc47f83dff93cdcbb3e4c232402fdae0aa61f..71893d5eaba18c01f0b7bf10106c705b1e98f391 100644 (file)
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -112,7 +112,7 @@ const EC_METHOD *EC_GFp_nist_method(void)
        return &ret;
        }
 
-#if BN_BITS2 == 64 && UINT_MAX != 4294967295UL && ULONG_MAX != 4294967295UL
+#if BN_BITS2 == 64
 #define        NO_32_BIT_TYPE
 #endif
 
@@ -140,7 +140,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
                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)
+#ifndef NO_32_BIT_TYPE
                group->field_mod_func = BN_nist_mod_224;
 #else
                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
@@ -149,7 +149,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
                }
        else if (BN_ucmp(BN_get0_nist_prime_256(), p) == 0)
                {
-#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
+#ifndef NO_32_BIT_TYPE
                group->field_mod_func = BN_nist_mod_256;
 #else
                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
@@ -158,7 +158,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
                }
        else if (BN_ucmp(BN_get0_nist_prime_384(), p) == 0)
                {
-#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
+#ifndef NO_32_BIT_TYPE
                group->field_mod_func = BN_nist_mod_384;
 #else
                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);