diff options
| author | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
| commit | 8bf56a9772e08d79d1a808bb69be82ca688afc76 (patch) | |
| tree | d3b23c04145e95d8d26c4e6efa1cd05fa34fd795 /crypto/openssh/key.c | |
| parent | 56fa0af6738b5c4466957197aaa372d30e74440b (diff) | |
| parent | f4c3a2131f559534b5693fd15df8d89049db7cbb (diff) | |
| download | FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.zip FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.tar.gz | |
Upgrade to OpenSSH 5.2p1.
MFC after: 3 months
Diffstat (limited to 'crypto/openssh/key.c')
| -rw-r--r-- | crypto/openssh/key.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/key.c b/crypto/openssh/key.c index 2ea13d2..3e17da6 100644 --- a/crypto/openssh/key.c +++ b/crypto/openssh/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; } |
