aboutsummaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2009-02-24 18:49:27 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2009-02-24 18:49:27 +0000
commit9ab1052dcdca9be06dcec8abc37103a70e358e73 (patch)
treee584c257bb55edd49609ecf2750698017a03411e /key.c
parent23371b1d95849b7f55a33cad9ba00f81e822c5a1 (diff)
Vendor import of OpenSSH 5.2p1vendor/openssh/5.2p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=189006 svn path=/vendor-crypto/openssh/5.2p1/; revision=189007; tag=vendor/openssh/5.2p1
Diffstat (limited to 'key.c')
-rw-r--r--key.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/key.c b/key.c
index 2ea13d27d1b1..3e17da601621 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.80 2008/10/10 05:00:12 stevesk Exp $ */
/*
* read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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;
}
}
@@ -427,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;
}