tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- otto@cvs.openbsd.org 2008/06/12 00:13:13 

[key.c]
     use an odd number of rows and columns and a separate start marker, looks
     better; ok grunk@
This commit is contained in:
Darren Tucker 2008-06-13 04:48:11 +10:00
parent 78913e0059
commit 267e28bb75
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -64,6 +64,10 @@
[sshconnect.c] [sshconnect.c]
Make ssh print the random art also when ssh'ing to a host using IP only. Make ssh print the random art also when ssh'ing to a host using IP only.
spotted by naddy@, ok and help djm@ dtucker@ spotted by naddy@, ok and help djm@ dtucker@
- otto@cvs.openbsd.org 2008/06/12 00:13:13
[key.c]
use an odd number of rows and columns and a separate start marker, looks
better; ok grunk@
20080611 20080611
- (djm) [channels.c configure.ac] - (djm) [channels.c configure.ac]
@ -4226,4 +4230,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4975 2008/06/12 18:47:34 dtucker Exp $ $Id: ChangeLog,v 1.4976 2008/06/12 18:48:11 dtucker Exp $

10
key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.c,v 1.72 2008/06/11 23:51:57 grunk Exp $ */ /* $OpenBSD: key.c,v 1.73 2008/06/12 00:13:13 otto Exp $ */
/* /*
* read_bignum(): * read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -319,8 +319,8 @@ key_fingerprint_bubblebabble(u_char *dgst_raw, u_int dgst_raw_len)
* Graphs are not unambiguous, because circles in graphs can be * Graphs are not unambiguous, because circles in graphs can be
* walked in either direction. * walked in either direction.
*/ */
#define FLDSIZE_Y 8 #define FLDSIZE_Y (8 + 1)
#define FLDSIZE_X (FLDSIZE_Y * 2) #define FLDSIZE_X (8 * 2 + 1)
static char * static char *
key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len) key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len)
{ {
@ -328,7 +328,7 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len)
* Chars to be used after each other every time the worm * Chars to be used after each other every time the worm
* intersects with itself. Matter of taste. * intersects with itself. Matter of taste.
*/ */
char *augmentation_string = " .o+=*BOX@%&#/^"; char *augmentation_string = " .o+=*BOX@%&#/^S";
char *retval, *p; char *retval, *p;
u_char field[FLDSIZE_X][FLDSIZE_Y]; u_char field[FLDSIZE_X][FLDSIZE_Y];
u_int i, b; u_int i, b;
@ -341,7 +341,6 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len)
memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char)); memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
x = FLDSIZE_X / 2; x = FLDSIZE_X / 2;
y = FLDSIZE_Y / 2; y = FLDSIZE_Y / 2;
field[x][y] = 1;
/* process raw key */ /* process raw key */
for (i = 0; i < dgst_raw_len; i++) { for (i = 0; i < dgst_raw_len; i++) {
@ -364,6 +363,7 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len)
input = input >> 2; input = input >> 2;
} }
} }
field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len;
/* fill in retval */ /* fill in retval */
p = retval; p = retval;