Fix various fiddly little warnings.

git-svn-id: svn://svn.tartarus.org/sgt/putty@1298 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/pubkey.but b/doc/pubkey.but
index fccd7b0..5a0346a 100644 (file)
--- a/doc/pubkey.but
+++ b/doc/pubkey.but
@@ -1,4 +1,4 @@
-\versionid $Id: pubkey.but,v 1.5 2001/09/22 20:52:21 simon Exp $
+\versionid $Id: pubkey.but,v 1.6 2001/09/25 19:59:14 simon Exp $
 
 \# FIXME: passphrases, examples (e.g what does a key for pasting into
 \# authorized_keys look like?), index entries, links.
@@ -65,7 +65,9 @@ The PuTTY key generator, described in \k{pubkey-puttygen}, offers
 you the opportunity to generate several types of key pair:
 
 \b An RSA key for use with the SSH 1 protocol.
+
 \b An RSA key for use with the SSH 2 protocol.
+
 \b A DSA key for use with the SSH 2 protocol.
 
 The SSH 1 protocol only supports RSA keys; if you will be connecting

diff --git a/pageant.rc b/pageant.rc
index fd3af6e..70aeec3 100644 (file)
--- a/pageant.rc
+++ b/pageant.rc
@@ -54,20 +54,20 @@ BEGIN
 
     LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
 
-    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
-    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
+    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
+    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
     LTEXT "Barry.", 1003, 10, 42, 206, 8
 
-    LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
-    LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
-    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
-    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
-    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
-    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
-    LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
+    LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8
+    LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8
+    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8
+    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8
+    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8
+    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8
+    LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8
 
-    LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
-    LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
+    LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8
+    LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8
 
     LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
     LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8

diff --git a/puttygen.rc b/puttygen.rc
index c8b4f3d..39e142b 100644 (file)
--- a/puttygen.rc
+++ b/puttygen.rc
@@ -48,20 +48,20 @@ BEGIN
 
     LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
 
-    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
-    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
+    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
+    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
     LTEXT "Barry.", 1003, 10, 42, 206, 8
 
-    LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
-    LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
-    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
-    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
-    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
-    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
-    LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
+    LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8
+    LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8
+    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8
+    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8
+    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8
+    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8
+    LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8
 
-    LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
-    LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
+    LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8
+    LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8
 
     LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
     LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8

diff --git a/sshbn.c b/sshbn.c
index 505a66c..40f9560 100644 (file)
--- a/sshbn.c
+++ b/sshbn.c
@@ -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;

diff --git a/sshdss.c b/sshdss.c
index 4856306..65844a9 100644 (file)
--- a/sshdss.c
+++ b/sshdss.c
@@ -19,7 +19,6 @@
 
 static void sha_mpint(SHA_State * s, Bignum b)
 {
-    unsigned char *p;
     unsigned char lenbuf[4];
     int len;
     len = (bignum_bitcount(b) + 8) / 8;
@@ -34,7 +33,6 @@ static void sha_mpint(SHA_State * s, Bignum b)
 
 static void sha512_mpint(SHA512_State * s, Bignum b)
 {
-    unsigned char *p;
     unsigned char lenbuf[4];
     int len;
     len = (bignum_bitcount(b) + 8) / 8;

diff --git a/win_res.rc b/win_res.rc
index 57e93cf..95d0ef9 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -75,20 +75,20 @@ BEGIN
 
     LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
 
-    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
-    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
+    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
+    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
     LTEXT "Barry.", 1003, 10, 42, 206, 8
 
-    LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
-    LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
-    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
-    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
-    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
-    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
-    LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
+    LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8
+    LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8
+    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8
+    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8
+    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8
+    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8
+    LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8
 
-    LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
-    LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
+    LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8
+    LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8
 
     LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
     LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8