From c6aadd994d0ed79f5606b7061d576d514fd71cd7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 3 Nov 2008 19:16:20 +1100 Subject: - grunk@cvs.openbsd.org 2008/07/25 07:05:16 [key.c] In random art visualization, make sure to use the end marker only at the end. Initial diff by Dirk Loss, tweaks and ok djm@ --- key.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'key.c') diff --git a/key.c b/key.c index 2ea13d27d..76d6af92b 100644 --- a/key.c +++ b/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.78 2008/07/07 23:32:51 stevesk Exp $ */ +/* $OpenBSD: key.c,v 1.79 2008/07/25 07:05:16 grunk Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -369,7 +369,8 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k) y = MIN(y, FLDSIZE_Y - 1); /* augment the field */ - field[x][y]++; + if (field[x][y] < len - 2) + field[x][y]++; input = input >> 2; } } -- cgit v1.2.3 From 2f54adabbb1e563ad639616ce7a93ffd17cc2de1 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 3 Nov 2008 19:24:16 +1100 Subject: - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 [key.c] typo in error message; ok djm@ --- ChangeLog | 5 ++++- key.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'key.c') diff --git a/ChangeLog b/ChangeLog index 991eb8c93..ccb604801 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,9 @@ - stevesk@cvs.openbsd.org 2008/10/10 04:55:16 [scp.c] spelling in comment; ok djm@ + - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 + [key.c] + typo in error message; ok djm@ 20080906 - (dtucker) [config.guess config.sub] Update to latest versions from @@ -4796,4 +4799,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5113 2008/11/03 08:23:45 djm Exp $ +$Id: ChangeLog,v 1.5114 2008/11/03 08:24:16 djm Exp $ diff --git a/key.c b/key.c index 76d6af92b..3e17da601 100644 --- a/key.c +++ b/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.79 2008/07/25 07:05:16 grunk Exp $ */ +/* $OpenBSD: key.c,v 1.80 2008/10/10 05:00:12 stevesk Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -428,7 +428,7 @@ key_fingerprint(const Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, k); break; default: - fatal("key_fingerprint_ex: bad digest representation %d", + fatal("key_fingerprint: bad digest representation %d", dgst_rep); break; } -- cgit v1.2.3