More preparatory work: remove the <windows.h> include from lots of

[u/mdw/putty] / sshbn.c

diff --git a/sshbn.c b/sshbn.c
index 505a66c..efd9624 100644 (file)
--- a/sshbn.c
+++ b/sshbn.c
@@ -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;
@@ -799,6 +799,7 @@ unsigned short bignum_mod_short(Bignum number, unsigned short modulus)
 
 void diagbn(char *prefix, Bignum md)
 {
+#ifdef DEBUG
     int i, nibbles, morenibbles;
     static const char hex[] = "0123456789ABCDEF";
 
@@ -816,6 +817,7 @@ void diagbn(char *prefix, Bignum md)
 
     if (prefix)
        debug(("\n"));
+#endif
 }
 
 /*