From 5cd0b37bc26d1ed66e622ae7e29c698b0882cb45 Mon Sep 17 00:00:00 2001 From: damien Date: Thu, 9 Mar 2000 10:27:49 +0000 Subject: - OpenBSD CVS updates to v1.2.3 [ssh.h atomicio.c] - int atomicio -> ssize_t (for alpha). ok deraadt@ [auth-rsa.c] - delay MD5 computation until client sends response, free() early, cleanup. [cipher.c] - void* -> unsigned char*, ok niels@ [hostfile.c] - remove unused variable 'len'. fix comments. - remove unused variable [log-client.c log-server.c] - rename a cpp symbol, to avoid param.h collision [packet.c] - missing xfree() - getsockname() requires initialized tolen; andy@guildsoftware.com - use getpeername() in packet_connection_is_on_socket(), fixes sshd -i; from Holger.Trapp@Informatik.TU-Chemnitz.DE [pty.c pty.h] - register cleanup for pty earlier. move code for pty-owner handling to pty.c ok provos@, dugsong@ [readconf.c] - turn off x11-fwd for the client, too. [rsa.c] - PKCS#1 padding [scp.c] - allow '.' in usernames; from jedgar@fxp.org [servconf.c] - typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de - sync with sshd_config [ssh-keygen.c] - enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@ [ssh.1] - Change invalid 'CHAT' loglevel to 'VERBOSE' [ssh.c] - suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp - turn off x11-fwd for the client, too. [sshconnect.c] - missing xfree() - retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp. - read error vs. "Connection closed by remote host" [sshd.8] - ie. -> i.e., - do not link to a commercial page.. - sync with sshd_config [sshd.c] - no need for poll.h; from bright@wintelcom.net - log with level log() not fatal() if peer behaves badly. - don't panic if client behaves strange. ok deraadt@ - make no-port-forwarding for RSA keys deny both -L and -R style fwding - delay close() of pty until the pty has been chowned back to root - oops, fix comment, too. - missing xfree() - move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too. (http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907) - register cleanup for pty earlier. move code for pty-owner handling to pty.c ok provos@, dugsong@ - create x11 cookie file - fix pr 1113, fclose() -> pclose(), todo: remote popen() - version 1.2.3 - Cleaned up --- hostfile.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'hostfile.c') diff --git a/hostfile.c b/hostfile.c index 831ac592..ea92fa04 100644 --- a/hostfile.c +++ b/hostfile.c @@ -14,13 +14,13 @@ */ #include "includes.h" -RCSID("$OpenBSD: hostfile.c,v 1.11 2000/01/04 00:07:59 markus Exp $"); +RCSID("$OpenBSD: hostfile.c,v 1.13 2000/02/18 10:20:20 markus Exp $"); #include "packet.h" #include "ssh.h" /* - * Reads a multiple-precision integer in hex from the buffer, and advances + * Reads a multiple-precision integer in decimal from the buffer, and advances * the pointer. The integer must already be initialized. This function is * permitted to modify the buffer. This leaves *cpp to point just beyond the * last processed (and maybe modified) character. Note that this may modify @@ -31,26 +31,23 @@ int auth_rsa_read_bignum(char **cpp, BIGNUM * value) { char *cp = *cpp; - int len, old; + int old; /* Skip any leading whitespace. */ for (; *cp == ' ' || *cp == '\t'; cp++) ; - /* Check that it begins with a hex digit. */ + /* Check that it begins with a decimal digit. */ if (*cp < '0' || *cp > '9') return 0; /* Save starting position. */ *cpp = cp; - /* Move forward until all hex digits skipped. */ + /* Move forward until all decimal digits skipped. */ for (; *cp >= '0' && *cp <= '9'; cp++) ; - /* Compute the length of the hex number. */ - len = cp - *cpp; - /* Save the old terminating character, and replace it by \0. */ old = *cp; *cp = 0; @@ -179,7 +176,7 @@ check_host_in_hostfile(const char *filename, const char *host, FILE *f; char line[8192]; int linenum = 0; - unsigned int bits, kbits, hostlen; + unsigned int kbits, hostlen; char *cp, *cp2; HostStatus end_return; @@ -198,9 +195,6 @@ check_host_in_hostfile(const char *filename, const char *host, */ end_return = HOST_NEW; - /* size of modulus 'n' */ - bits = BN_num_bits(n); - /* Go trough the file. */ while (fgets(line, sizeof(line), f)) { cp = line; -- cgit v1.2.1