some const fixes and cleanup

[openssl.git] / crypto / bn / bn_nist.c

diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 2e03d0709d5ba171aa6a4cd6dadef2c1db24f783..bbe2cbe74971fa7655ad6e4c9f1ebe061e58777f 100644 (file)
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -1,4 +1,4 @@
-/* crypto/bn/bn_nist.p */
+/* crypto/bn/bn_nist.c */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -63,19 +63,25 @@
 #define BN_NIST_521_TOP        (521+BN_BITS2-1)/BN_BITS2
 
 #if BN_BITS2 == 64
-const static BN_ULONG _nist_p_192[] = {0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFE,
-       0xFFFFFFFFFFFFFFFF};
-const static BN_ULONG _nist_p_224[] = {0x0000000000000001,0xFFFFFFFF00000000,
-       0xFFFFFFFFFFFFFFFF,0x00000000FFFFFFFF};
-const static BN_ULONG _nist_p_256[] = {0xFFFFFFFFFFFFFFFF,0x00000000FFFFFFFF,
-       0x0000000000000000,0xFFFFFFFF00000001};
-const static BN_ULONG _nist_p_384[] = {0x00000000FFFFFFFF,0xFFFFFFFF00000000,
-       0xFFFFFFFFFFFFFFFE,0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,
-       0xFFFFFFFFFFFFFFFF};
-const static BN_ULONG _nist_p_521[] = {0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,
-       0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,
-       0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF,
-       0x00000000000001FF};
+const static BN_ULONG _nist_p_192[] =
+       {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,
+       0xFFFFFFFFFFFFFFFFULL};
+const static BN_ULONG _nist_p_224[] =
+       {0x0000000000000001ULL,0xFFFFFFFF00000000ULL,
+       0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL};
+const static BN_ULONG _nist_p_256[] =
+       {0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL,
+       0x0000000000000000ULL,0xFFFFFFFF00000001ULL};
+const static BN_ULONG _nist_p_384[] =
+       {0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,
+       0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL,
+       0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL};
+const static BN_ULONG _nist_p_521[] =
+       {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+       0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+       0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+       0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+       0x00000000000001FFULL};
 #elif BN_BITS2 == 32
 const static BN_ULONG _nist_p_192[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,
        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
@@ -127,40 +133,39 @@ const static BN_ULONG _nist_p_521[] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
        0xFF,0x01};
 #endif
 
-static const BIGNUM_C bn_nist_p_192 =
-       { _nist_p_192, BN_NIST_192_TOP, BN_NIST_192_TOP, 0, BN_FLG_STATIC_DATA };
-static const BIGNUM_C bn_nist_p_224 =
-       { _nist_p_224, BN_NIST_224_TOP, BN_NIST_224_TOP, 0, BN_FLG_STATIC_DATA };
-static const BIGNUM_C bn_nist_p_256 =
-       { _nist_p_256, BN_NIST_256_TOP, BN_NIST_256_TOP, 0, BN_FLG_STATIC_DATA };
-static const BIGNUM_C bn_nist_p_384 =
-       { _nist_p_384, BN_NIST_384_TOP, BN_NIST_384_TOP, 0, BN_FLG_STATIC_DATA };
-static const BIGNUM_C bn_nist_p_521 =
-       { _nist_p_521, BN_NIST_521_TOP, BN_NIST_521_TOP, 0, BN_FLG_STATIC_DATA };
-
 const BIGNUM *BN_get0_nist_prime_192(void)
        {
-       return BIGNUM_CONST(&bn_nist_p_192);
+       static BIGNUM const_nist_192 = { (BN_ULONG *)_nist_p_192,
+               BN_NIST_192_TOP, BN_NIST_192_TOP, 0, BN_FLG_STATIC_DATA };
+       return &const_nist_192;
        }
 
 const BIGNUM *BN_get0_nist_prime_224(void)
        {
-       return BIGNUM_CONST(&bn_nist_p_224);
+       static BIGNUM const_nist_224 = { (BN_ULONG *)_nist_p_224,
+               BN_NIST_224_TOP, BN_NIST_224_TOP, 0, BN_FLG_STATIC_DATA };
+       return &const_nist_224;
        }
 
 const BIGNUM *BN_get0_nist_prime_256(void)
        {
-       return BIGNUM_CONST(&bn_nist_p_256);
+       static BIGNUM const_nist_256 = { (BN_ULONG *)_nist_p_256,
+               BN_NIST_256_TOP, BN_NIST_256_TOP, 0, BN_FLG_STATIC_DATA };
+       return &const_nist_256;
        }
 
 const BIGNUM *BN_get0_nist_prime_384(void)
        {
-       return BIGNUM_CONST(&bn_nist_p_384);
+       static BIGNUM const_nist_384 = { (BN_ULONG *)_nist_p_384,
+               BN_NIST_384_TOP, BN_NIST_384_TOP, 0, BN_FLG_STATIC_DATA };
+       return &const_nist_384;
        }
 
 const BIGNUM *BN_get0_nist_prime_521(void)
        {
-       return BIGNUM_CONST(&bn_nist_p_521);
+       static BIGNUM const_nist_521 = { (BN_ULONG *)_nist_p_521,
+               BN_NIST_521_TOP, BN_NIST_521_TOP, 0, BN_FLG_STATIC_DATA };
+       return &const_nist_521;
        }
 
 /* some misc internal functions */
@@ -314,7 +319,10 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 
        top = BN_ucmp(field, a);
        if (top == 0)
-               return BN_zero(r);
+               {
+               BN_zero(r);
+               return 1;
+               }
        else if (top > 0)
                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
 
@@ -354,12 +362,7 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                        --carry; 
                }
        r->top = BN_NIST_192_TOP;
-
-#if 1
-       bn_clear_top2max(r);
-#endif
        bn_correct_top(r);
-
        if (BN_ucmp(r, field) >= 0)
                {
                bn_sub_words(r_d, r_d, _nist_p_192, BN_NIST_192_TOP);
@@ -394,7 +397,10 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 
        tmp_int = BN_ucmp(field, a);
        if (tmp_int == 0)
-               return BN_zero(r);
+               {
+               BN_zero(r);
+               return 1;
+               }
        else if (tmp_int > 0)
                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
 
@@ -448,11 +454,7 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                        }
 
        r->top = BN_NIST_224_TOP;
-#if 1
-       bn_clear_top2max(r);
-#endif
        bn_correct_top(r);
-
        if (BN_ucmp(r, field) >= 0)
                {
                bn_sub_words(r_d, r_d, _nist_p_224, BN_NIST_224_TOP);
@@ -518,7 +520,10 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        
        tmp_int = BN_ucmp(field, a);
        if (tmp_int == 0)
-               return BN_zero(r);
+               {
+               BN_zero(r);
+               return 1;
+               }
        else if (tmp_int > 0)
                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
 
@@ -607,11 +612,7 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                }
 
        r->top = BN_NIST_256_TOP;
-#if 1
-       bn_clear_top2max(r);
-#endif
        bn_correct_top(r);
-
        if (BN_ucmp(r, field) >= 0)
                {
                bn_sub_words(r_d, r_d, _nist_p_256, BN_NIST_256_TOP);
@@ -680,7 +681,10 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 
        tmp_int = BN_ucmp(field, a);
        if (tmp_int == 0)
-               return BN_zero(r);
+               {
+               BN_zero(r);
+               return 1;
+               }
        else if (tmp_int > 0)
                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
 
@@ -776,11 +780,7 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                }
 
        r->top = BN_NIST_384_TOP;
-#if 1
-       bn_clear_top2max(r);
-#endif
        bn_correct_top(r);
-
        if (BN_ucmp(r, field) >= 0)
                {
                bn_sub_words(r_d, r_d, _nist_p_384, BN_NIST_384_TOP);