Deleted Added
sdiff udiff text old ( 126277 ) new ( 128460 )
full compact
ssh-keyscan.c (126277) ssh-keyscan.c (128460)
1/*
2 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
3 *
4 * Modification and redistribution in source and binary forms is
5 * permitted provided that due credit is given to the author and the
6 * OpenBSD project by leaving this copyright notice intact.
7 */
8
9#include "includes.h"
1/*
2 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
3 *
4 * Modification and redistribution in source and binary forms is
5 * permitted provided that due credit is given to the author and the
6 * OpenBSD project by leaving this copyright notice intact.
7 */
8
9#include "includes.h"
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.46 2003/11/23 23:17:34 djm Exp $");
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $");
11
12#include "openbsd-compat/sys-queue.h"
13
14#include <openssl/bn.h>
15
16#include <setjmp.h>
17#include "xmalloc.h"
18#include "ssh.h"

--- 465 unchanged lines hidden (view full) ---

484 ret = conalloc(c->c_namelist, c->c_output_name, c->c_keytype);
485 confree(s);
486 return (ret);
487}
488
489static void
490congreet(int s)
491{
11
12#include "openbsd-compat/sys-queue.h"
13
14#include <openssl/bn.h>
15
16#include <setjmp.h>
17#include "xmalloc.h"
18#include "ssh.h"

--- 465 unchanged lines hidden (view full) ---

484 ret = conalloc(c->c_namelist, c->c_output_name, c->c_keytype);
485 confree(s);
486 return (ret);
487}
488
489static void
490congreet(int s)
491{
492 int remote_major, remote_minor, n = 0;
492 int remote_major = 0, remote_minor = 0, n = 0;
493 char buf[256], *cp;
494 char remote_version[sizeof buf];
495 size_t bufsiz;
496 con *c = &fdcon[s];
497
498 bufsiz = sizeof(buf);
499 cp = buf;
500 while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n') {

--- 312 unchanged lines hidden --- 		493 char buf[256], *cp;
494 char remote_version[sizeof buf];
495 size_t bufsiz;
496 con *c = &fdcon[s];
497
498 bufsiz = sizeof(buf);
499 cp = buf;
500 while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n') {

--- 312 unchanged lines hidden ---