diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /key.c | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.c,v 1.78 2008/07/07 23:32:51 stevesk Exp $ */ | 1 | /* $OpenBSD: key.c,v 1.80 2008/10/10 05:00:12 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * read_bignum(): | 3 | * read_bignum(): |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
369 | y = MIN(y, FLDSIZE_Y - 1); | 369 | y = MIN(y, FLDSIZE_Y - 1); |
370 | 370 | ||
371 | /* augment the field */ | 371 | /* augment the field */ |
372 | field[x][y]++; | 372 | if (field[x][y] < len - 2) |
373 | field[x][y]++; | ||
373 | input = input >> 2; | 374 | input = input >> 2; |
374 | } | 375 | } |
375 | } | 376 | } |
@@ -427,7 +428,7 @@ key_fingerprint(const Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | |||
427 | retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, k); | 428 | retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, k); |
428 | break; | 429 | break; |
429 | default: | 430 | default: |
430 | fatal("key_fingerprint_ex: bad digest representation %d", | 431 | fatal("key_fingerprint: bad digest representation %d", |
431 | dgst_rep); | 432 | dgst_rep); |
432 | break; | 433 | break; |
433 | } | 434 | } |