ec/ecp_nistz256.c: harmonize with latest indent script.

[oweals/openssl.git] / crypto / bn / bn_add.c

diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index f8e6729a47746ed5fd98f39c6b203a97e9f0ddc2..2584234cbfa3cca649949e57b2156b6f52b1ea38 100644 (file)
--- a/crypto/bn/bn_add.c
+++ b/crypto/bn/bn_add.c
@@ -56,9 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
 
-#include <stdio.h>
+
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
@@ -71,7 +70,8 @@ int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
        bn_check_top(a);
        bn_check_top(b);
 
-       /*  a +  b      a+b
+       /*-
+        *  a +  b      a+b
         *  a + -b      a-b
         * -a +  b      b-a
         * -a + -b      -(a+b)
@@ -107,7 +107,8 @@ int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
 int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
        {
        int max,min,dif;
-       BN_ULONG *ap,*bp,*rp,carry,t1,t2;
+       const BN_ULONG *ap,*bp;
+       BN_ULONG *rp,carry,t1,t2;
        const BIGNUM *tmp;
 
        bn_check_top(a);
@@ -168,11 +169,9 @@ int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
 int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
        {
        int max,min,dif;
-       register BN_ULONG t1,t2,*ap,*bp,*rp;
+       register BN_ULONG t1,t2,*rp;
+       register const BN_ULONG *ap,*bp;
        int i,carry;
-#if defined(IRIX_CC_BUG) && !defined(LINT)
-       int dummy;
-#endif
 
        bn_check_top(a);
        bn_check_top(b);
@@ -209,9 +208,6 @@ int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
                        carry=(t1 < t2);
                        t1=(t1-t2)&BN_MASK2;
                        }
-#if defined(IRIX_CC_BUG) && !defined(LINT)
-               dummy=t1;
-#endif
                *(rp++)=t1&BN_MASK2;
                }
 #else
@@ -271,7 +267,8 @@ int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
        bn_check_top(a);
        bn_check_top(b);
 
-       /*  a -  b      a-b
+       /*-
+        *  a -  b      a-b
         *  a - -b      a+b
         * -a -  b      -(a+b)
         * -a - -b      b-a