===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v
retrieving revision 1.51.2.2
retrieving revision 1.52
diff -u -r1.51.2.2 -r1.52
--- src/usr.bin/ssh/Attic/key.c	2004/03/04 18:18:15	1.51.2.2
+++ src/usr.bin/ssh/Attic/key.c	2003/05/14 18:16:20	1.52
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.51.2.2 2004/03/04 18:18:15 brad Exp $");
+RCSID("$OpenBSD: key.c,v 1.52 2003/05/14 18:16:20 jakob Exp $");
 
 #include <openssl/evp.h>
 
@@ -143,9 +143,8 @@
 	}
 	xfree(k);
 }
-
 int
-key_equal(const Key *a, const Key *b)
+key_equal(Key *a, Key *b)
 {
 	if (a == NULL || b == NULL || a->type != b->type)
 		return 0;
@@ -171,8 +170,7 @@
 }
 
 u_char*
-key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
-    u_int *dgst_raw_length)
+key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
 {
 	const EVP_MD *md = NULL;
 	EVP_MD_CTX ctx;
@@ -238,10 +236,8 @@
 	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 + 1);
+		strlcat(retval, hex, dgst_raw_len * 3);
 	}
-
-	/* Remove the trailing ':' character */
 	retval[(dgst_raw_len * 3) - 1] = '\0';
 	return retval;
 }
@@ -294,7 +290,7 @@
 }
 
 char *
-key_fingerprint(const Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep)
+key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep)
 {
 	char *retval = NULL;
 	u_char *dgst_raw;
@@ -442,7 +438,7 @@
 			xfree(blob);
 			return -1;
 		}
-		k = key_from_blob(blob, (u_int)n);
+		k = key_from_blob(blob, n);
 		xfree(blob);
 		if (k == NULL) {
 			error("key_read: key_from_blob %s failed", cp);
@@ -492,7 +488,7 @@
 }
 
 int
-key_write(const Key *key, FILE *f)
+key_write(Key *key, FILE *f)
 {
 	int n, success = 0;
 	u_int len, bits = 0;
@@ -524,8 +520,8 @@
 	return success;
 }
 
-const char *
-key_type(const Key *k)
+char *
+key_type(Key *k)
 {
 	switch (k->type) {
 	case KEY_RSA1:
@@ -541,8 +537,8 @@
 	return "unknown";
 }
 
-const char *
-key_ssh_name(const Key *k)
+char *
+key_ssh_name(Key *k)
 {
 	switch (k->type) {
 	case KEY_RSA:
@@ -556,7 +552,7 @@
 }
 
 u_int
-key_size(const Key *k)
+key_size(Key *k)
 {
 	switch (k->type) {
 	case KEY_RSA1:
@@ -613,7 +609,7 @@
 }
 
 Key *
-key_from_private(const Key *k)
+key_from_private(Key *k)
 {
 	Key *n = NULL;
 	switch (k->type) {
@@ -678,7 +674,7 @@
 }
 
 Key *
-key_from_blob(const u_char *blob, u_int blen)
+key_from_blob(u_char *blob, int blen)
 {
 	Buffer b;
 	char *ktype;
@@ -728,7 +724,7 @@
 }
 
 int
-key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+key_to_blob(Key *key, u_char **blobp, u_int *lenp)
 {
 	Buffer b;
 	int len;
@@ -770,9 +766,9 @@
 
 int
 key_sign(
-    const Key *key,
+    Key *key,
     u_char **sigp, u_int *lenp,
-    const u_char *data, u_int datalen)
+    u_char *data, u_int datalen)
 {
 	switch (key->type) {
 	case KEY_DSA:
@@ -794,9 +790,9 @@
  */
 int
 key_verify(
-    const Key *key,
-    const u_char *signature, u_int signaturelen,
-    const u_char *data, u_int datalen)
+    Key *key,
+    u_char *signature, u_int signaturelen,
+    u_char *data, u_int datalen)
 {
 	if (signaturelen == 0)
 		return -1;
@@ -817,7 +813,7 @@
 
 /* Converts a private to a public key */
 Key *
-key_demote(const Key *k)
+key_demote(Key *k)
 {
 	Key *pk;