Miscellaneous fixes to finish up `remove-statics'. rlogin.c had a

[u/mdw/putty] / sshbn.c

diff --git a/sshbn.c b/sshbn.c
index 505a66c..22ed5dc 100644 (file)
--- a/sshbn.c
+++ b/sshbn.c
@@ -406,7 +406,7 @@ Bignum modmul(Bignum p, Bignum q, Bignum mod)
  * We optionally write out a quotient if `quotient' is non-NULL.
  * We can avoid writing out the result if `result' is NULL.
  */
-void bigdivmod(Bignum p, Bignum mod, Bignum result, Bignum quotient)
+static void bigdivmod(Bignum p, Bignum mod, Bignum result, Bignum quotient)
 {
     unsigned short *n, *m;
     int mshift;
@@ -482,7 +482,7 @@ void decbn(Bignum bn)
     bn[i]--;
 }
 
-Bignum bignum_from_bytes(unsigned char *data, int nbytes)
+Bignum bignum_from_bytes(const unsigned char *data, int nbytes)
 {
     Bignum result;
     int w, i;
@@ -509,9 +509,9 @@ Bignum bignum_from_bytes(unsigned char *data, int nbytes)
  * Read an ssh1-format bignum from a data buffer. Return the number
  * of bytes consumed.
  */
-int ssh1_read_bignum(unsigned char *data, Bignum * result)
+int ssh1_read_bignum(const unsigned char *data, Bignum * result)
 {
-    unsigned char *p = data;
+    const unsigned char *p = data;
     int i;
     int w, b;
 
@@ -753,8 +753,8 @@ Bignum bignum_from_long(unsigned long n)
     Bignum ret;
 
     ret = newbn(3);
-    ret[1] = n & 0xFFFF;
-    ret[2] = (n >> 16) & 0xFFFF;
+    ret[1] = (unsigned short)(n & 0xFFFF);
+    ret[2] = (unsigned short)((n >> 16) & 0xFFFF);
     ret[3] = 0;
     ret[0] = (ret[2]  ? 2 : 1);
     return ret;
@@ -797,8 +797,10 @@ unsigned short bignum_mod_short(Bignum number, unsigned short modulus)
     return (unsigned short) r;
 }
 
+#if 0
 void diagbn(char *prefix, Bignum md)
 {
+#ifdef DEBUG
     int i, nibbles, morenibbles;
     static const char hex[] = "0123456789ABCDEF";
 
@@ -816,7 +818,9 @@ void diagbn(char *prefix, Bignum md)
 
     if (prefix)
        debug(("\n"));
+#endif
 }
+#endif
 
 /*
  * Simple division.