--- rsaref/source/digit.c	2018/04/24 16:37:52	1.1.1.1
+++ rsaref/source/digit.c	2018/04/24 16:38:03	1.1.1.2
@@ -1,8 +1,8 @@
 /* DIGIT.C - digit arithmetic routines
  */
 
-/* Copyright (C) 1991-2 RSA Laboratories, a division of RSA Data
-   Security, Inc. All rights reserved.
+/* Copyright (C) RSA Laboratories, a division of RSA Data Security,
+      Inc., created 1991. All rights reserved.
  */
 
 #include "global.h"
@@ -20,10 +20,10 @@ NN_DIGIT a[2], b, c;
   NN_DIGIT t, u;
   NN_HALF_DIGIT bHigh, bLow, cHigh, cLow;
 
-  bHigh = HIGH_HALF (b);
-  bLow = LOW_HALF (b);
-  cHigh = HIGH_HALF (c);
-  cLow = LOW_HALF (c);
+  bHigh = (NN_HALF_DIGIT)HIGH_HALF (b);
+  bLow = (NN_HALF_DIGIT)LOW_HALF (b);
+  cHigh = (NN_HALF_DIGIT)HIGH_HALF (c);
+  cLow = (NN_HALF_DIGIT)LOW_HALF (c);
 
   a[0] = (NN_DIGIT)bLow * (NN_DIGIT)cLow;
   t = (NN_DIGIT)bLow * (NN_DIGIT)cHigh;
@@ -51,8 +51,8 @@ NN_DIGIT *a, b[2], c;
   NN_DIGIT t[2], u, v;
   NN_HALF_DIGIT aHigh, aLow, cHigh, cLow;
 
-  cHigh = HIGH_HALF (c);
-  cLow = LOW_HALF (c);
+  cHigh = (NN_HALF_DIGIT)HIGH_HALF (c);
+  cLow = (NN_HALF_DIGIT)LOW_HALF (c);
 
   t[0] = b[0];
   t[1] = b[1];
@@ -60,7 +60,7 @@ NN_DIGIT *a, b[2], c;
   /* Underestimate high half of quotient and subtract.
    */
   if (cHigh == MAX_NN_HALF_DIGIT)
-    aHigh = HIGH_HALF (t[1]);
+    aHigh = (NN_HALF_DIGIT)HIGH_HALF (t[1]);
   else
     aHigh = (NN_HALF_DIGIT)(t[1] / (cHigh + 1));
   u = (NN_DIGIT)aHigh * (NN_DIGIT)cLow;
@@ -83,11 +83,10 @@ NN_DIGIT *a, b[2], c;
   /* Underestimate low half of quotient and subtract.
    */
   if (cHigh == MAX_NN_HALF_DIGIT)
-    aLow = LOW_HALF (t[1]);
+    aLow = (NN_HALF_DIGIT)LOW_HALF (t[1]);
   else
-    aLow =
-      (NN_HALF_DIGIT)
-        ((NN_DIGIT)(TO_HIGH_HALF (t[1]) + HIGH_HALF (t[0])) / (cHigh + 1));
+    aLow = 
+      (NN_HALF_DIGIT)((TO_HIGH_HALF (t[1]) + HIGH_HALF (t[0])) / (cHigh + 1));
   u = (NN_DIGIT)aLow * (NN_DIGIT)cLow;
   v = (NN_DIGIT)aLow * (NN_DIGIT)cHigh;
   if ((t[0] -= u) > (MAX_NN_DIGIT - u))