===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -r1.49.2.1 -r1.49.2.2
--- src/usr.bin/ssh/Attic/key.c	2003/04/01 00:12:13	1.49.2.1
+++ src/usr.bin/ssh/Attic/key.c	2003/09/16 21:20:26	1.49.2.2
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.49.2.1 2003/04/01 00:12:13 margarida Exp $");
+RCSID("$OpenBSD: key.c,v 1.49.2.2 2003/09/16 21:20:26 brad Exp $");
 
 #include <openssl/evp.h>
 
@@ -169,7 +169,7 @@
 	return 0;
 }
 
-static u_char *
+u_char*
 key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
 {
 	const EVP_MD *md = NULL;
@@ -236,8 +236,10 @@
 	for (i = 0; i < dgst_raw_len; i++) {
 		char hex[4];
 		snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]);
-		strlcat(retval, hex, dgst_raw_len * 3);
+		strlcat(retval, hex, dgst_raw_len * 3 + 1);
 	}
+
+	/* Remove the trailing ':' character */
 	retval[(dgst_raw_len * 3) - 1] = '\0';
 	return retval;
 }
@@ -438,7 +440,7 @@
 			xfree(blob);
 			return -1;
 		}
-		k = key_from_blob(blob, n);
+		k = key_from_blob(blob, (u_int)n);
 		xfree(blob);
 		if (k == NULL) {
 			error("key_read: key_from_blob %s failed", cp);
@@ -674,7 +676,7 @@
 }
 
 Key *
-key_from_blob(u_char *blob, int blen)
+key_from_blob(u_char *blob, u_int blen)
 {
 	Buffer b;
 	char *ktype;