tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 23:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2004/07/11 17:48:47

Browse Source 
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
     readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
     session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
     sshd.c ttymodes.h]
     spaces
This commit is contained in:
Darren Tucker 2004-07-17 16:12:08 +10:00
parent ba6de952a0
commit fc9597034b
22 changed files with 127 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -3,6 +3,13 @@
ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces
diff vs OpenBSD; ok mouring@, tested by tim@ too. diff vs OpenBSD; ok mouring@, tested by tim@ too.
- (dtucker) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
sshd.c ttymodes.h]
spaces
20040711 20040711
- (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
@ -1509,4 +1516,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3474 2004/07/17 04:07:42 dtucker Exp $ $Id: ChangeLog,v 1.3475 2004/07/17 06:12:08 dtucker Exp $

5
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.207 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: channels.c,v 1.208 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -2277,7 +2277,7 @@ channel_cancel_rport_listener(const char *host, u_short port)
if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER && if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER &&
strncmp(c->path, host, sizeof(c->path)) == 0 && strncmp(c->path, host, sizeof(c->path)) == 0 &&
c->listening_port == port) { c->listening_port == port) {
debug2("%s: close clannel %d", __func__, i); debug2("%s: close clannel %d", __func__, i);
channel_free(c); channel_free(c);
found = 1; found = 1;
@ -2367,7 +2367,6 @@ channel_request_remote_forwarding(u_short listen_port,
* Request cancellation of remote forwarding of connection host:port from * Request cancellation of remote forwarding of connection host:port from
* local side. * local side.
*/ */
void void
channel_request_rforward_cancel(u_short port) channel_request_rforward_cancel(u_short port)
{ {

30
cipher.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cipher.c,v 1.69 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: cipher.c,v 1.70 2004/07/11 17:48:47 deraadt Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"
@ -76,19 +76,19 @@ struct Cipher {
u_int key_len; u_int key_len;
const EVP_CIPHER *(*evptype)(void); const EVP_CIPHER *(*evptype)(void);
} ciphers[] = { } ciphers[] = {
{ "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null },
{ "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc },
{ "3des", SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des }, { "3des", SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des },
{ "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf }, { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf },
{ "3des-cbc", SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc }, { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc },
{ "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc }, { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc },
{ "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc }, { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc },
{ "arcfour", SSH_CIPHER_SSH2, 8, 16, EVP_rc4 }, { "arcfour", SSH_CIPHER_SSH2, 8, 16, EVP_rc4 },
#if OPENSSL_VERSION_NUMBER < 0x00907000L #if OPENSSL_VERSION_NUMBER < 0x00907000L
{ "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael },
{ "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael },
{ "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
{ "rijndael-cbc@lysator.liu.se", { "rijndael-cbc@lysator.liu.se",
SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
#else #else
@ -99,9 +99,9 @@ struct Cipher {
SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc },
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x00905000L #if OPENSSL_VERSION_NUMBER >= 0x00905000L
{ "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr },
{ "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr },
{ "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },
#endif #endif
#if defined(EVP_CTRL_SET_ACSS_MODE) #if defined(EVP_CTRL_SET_ACSS_MODE)
{ "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss },

2
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.128 2004/06/18 11:11:54 djm Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.129 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"

2
clientloop.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.h,v 1.10 2004/06/17 14:52:48 djm Exp $ */ /* $OpenBSD: clientloop.h,v 1.11 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>

4
compat.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $ */ /* $OpenBSD: compat.h,v 1.38 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.
@ -27,7 +27,7 @@
#ifndef COMPAT_H #ifndef COMPAT_H
#define COMPAT_H #define COMPAT_H
#define SSH_PROTO_UNKNOWN 0x00 #define SSH_PROTO_UNKNOWN 0x00
#define SSH_PROTO_1 0x01 #define SSH_PROTO_1 0x01
#define SSH_PROTO_1_PREFERRED 0x02 #define SSH_PROTO_1_PREFERRED 0x02
#define SSH_PROTO_2 0x04 #define SSH_PROTO_2 0x04

48
moduli.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: moduli.c,v 1.8 2004/05/21 08:43:03 markus Exp $ */ /* $OpenBSD: moduli.c,v 1.9 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@ -48,68 +48,68 @@
*/ */
/* need line long enough for largest moduli plus headers */ /* need line long enough for largest moduli plus headers */
#define QLINESIZE (100+8192) #define QLINESIZE (100+8192)
/* Type: decimal. /* Type: decimal.
* Specifies the internal structure of the prime modulus. * Specifies the internal structure of the prime modulus.
*/ */
#define QTYPE_UNKNOWN (0) #define QTYPE_UNKNOWN (0)
#define QTYPE_UNSTRUCTURED (1) #define QTYPE_UNSTRUCTURED (1)
#define QTYPE_SAFE (2) #define QTYPE_SAFE (2)
#define QTYPE_SCHNOOR (3) #define QTYPE_SCHNOOR (3)
#define QTYPE_SOPHIE_GERMAIN (4) #define QTYPE_SOPHIE_GERMAIN (4)
#define QTYPE_STRONG (5) #define QTYPE_STRONG (5)
/* Tests: decimal (bit field). /* Tests: decimal (bit field).
* Specifies the methods used in checking for primality. * Specifies the methods used in checking for primality.
* Usually, more than one test is used. * Usually, more than one test is used.
*/ */
#define QTEST_UNTESTED (0x00) #define QTEST_UNTESTED (0x00)
#define QTEST_COMPOSITE (0x01) #define QTEST_COMPOSITE (0x01)
#define QTEST_SIEVE (0x02) #define QTEST_SIEVE (0x02)
#define QTEST_MILLER_RABIN (0x04) #define QTEST_MILLER_RABIN (0x04)
#define QTEST_JACOBI (0x08) #define QTEST_JACOBI (0x08)
#define QTEST_ELLIPTIC (0x10) #define QTEST_ELLIPTIC (0x10)
/* /*
* Size: decimal. * Size: decimal.
* Specifies the number of the most significant bit (0 to M). * Specifies the number of the most significant bit (0 to M).
* WARNING: internally, usually 1 to N. * WARNING: internally, usually 1 to N.
*/ */
#define QSIZE_MINIMUM (511) #define QSIZE_MINIMUM (511)
/* /*
* Prime sieving defines * Prime sieving defines
*/ */
/* Constant: assuming 8 bit bytes and 32 bit words */ /* Constant: assuming 8 bit bytes and 32 bit words */
#define SHIFT_BIT (3) #define SHIFT_BIT (3)
#define SHIFT_BYTE (2) #define SHIFT_BYTE (2)
#define SHIFT_WORD (SHIFT_BIT+SHIFT_BYTE) #define SHIFT_WORD (SHIFT_BIT+SHIFT_BYTE)
#define SHIFT_MEGABYTE (20) #define SHIFT_MEGABYTE (20)
#define SHIFT_MEGAWORD (SHIFT_MEGABYTE-SHIFT_BYTE) #define SHIFT_MEGAWORD (SHIFT_MEGABYTE-SHIFT_BYTE)
/* /*
* Using virtual memory can cause thrashing. This should be the largest * Using virtual memory can cause thrashing. This should be the largest
* number that is supported without a large amount of disk activity -- * number that is supported without a large amount of disk activity --
* that would increase the run time from hours to days or weeks! * that would increase the run time from hours to days or weeks!
*/ */
#define LARGE_MINIMUM (8UL) /* megabytes */ #define LARGE_MINIMUM (8UL) /* megabytes */
/* /*
* Do not increase this number beyond the unsigned integer bit size. * Do not increase this number beyond the unsigned integer bit size.
* Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits). * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits).
*/ */
#define LARGE_MAXIMUM (127UL) /* megabytes */ #define LARGE_MAXIMUM (127UL) /* megabytes */
/* /*
* Constant: when used with 32-bit integers, the largest sieve prime * Constant: when used with 32-bit integers, the largest sieve prime
* has to be less than 2**32. * has to be less than 2**32.
*/ */
#define SMALL_MAXIMUM (0xffffffffUL) #define SMALL_MAXIMUM (0xffffffffUL)
/* Constant: can sieve all primes less than 2**32, as 65537**2 > 2**32-1. */ /* Constant: can sieve all primes less than 2**32, as 65537**2 > 2**32-1. */
#define TINY_NUMBER (1UL<<16) #define TINY_NUMBER (1UL<<16)
/* Ensure enough bit space for testing 2*q. */ /* Ensure enough bit space for testing 2*q. */
#define TEST_MAXIMUM (1UL<<16) #define TEST_MAXIMUM (1UL<<16)

16
nchan.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: nchan.c,v 1.50 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.50 2004/06/21 17:36:31 avsm Exp $");
* tear down of channels: * tear down of channels:
* *
* 1.3: strict request-ack-protocol: * 1.3: strict request-ack-protocol:
* CLOSE -> * CLOSE ->
* <- CLOSE_CONFIRM * <- CLOSE_CONFIRM
* *
* 1.5: uses variations of: * 1.5: uses variations of:
* IEOF -> * IEOF ->
* <- OCLOSE * <- OCLOSE
* <- IEOF * <- IEOF
* OCLOSE -> * OCLOSE ->
* i.e. both sides have to close the channel * i.e. both sides have to close the channel
* *
* 2.0: the EOF messages are optional * 2.0: the EOF messages are optional
* *

4
pathnames.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pathnames.h,v 1.14 2004/01/30 09:48:57 markus Exp $ */ /* $OpenBSD: pathnames.h,v 1.15 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -122,7 +122,7 @@
/* Location of ssh-keysign for hostbased authentication */ /* Location of ssh-keysign for hostbased authentication */
#ifndef _PATH_SSH_KEY_SIGN #ifndef _PATH_SSH_KEY_SIGN
#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" #define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
#endif #endif
/* xauth for X11 forwarding */ /* xauth for X11 forwarding */

18
progressmeter.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: progressmeter.c,v 1.21 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $");
#include "progressmeter.h" #include "progressmeter.h"
#include "atomicio.h" #include "atomicio.h"
@ -48,15 +48,15 @@ void refresh_progress_meter(void);
/* signal handler for updating the progress meter */ /* signal handler for updating the progress meter */
static void update_progress_meter(int); static void update_progress_meter(int);
static time_t start; /* start progress */ static time_t start; /* start progress */
static time_t last_update; /* last progress update */ static time_t last_update; /* last progress update */
static char *file; /* name of the file being transferred */ static char *file; /* name of the file being transferred */
static off_t end_pos; /* ending position of transfer */ static off_t end_pos; /* ending position of transfer */
static off_t cur_pos; /* transfer position as of last refresh */ static off_t cur_pos; /* transfer position as of last refresh */
static volatile off_t *counter; /* progress counter */ static volatile off_t *counter; /* progress counter */
static long stalled; /* how long we have been stalled */ static long stalled; /* how long we have been stalled */
static int bytes_per_second; /* current speed in bytes per second */ static int bytes_per_second; /* current speed in bytes per second */
static int win_size; /* terminal window size */ static int win_size; /* terminal window size */
/* units for format_size */ /* units for format_size */
static const char unit[] = " KMGT"; static const char unit[] = " KMGT";

2
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.133 2004/06/17 15:10:14 djm Exp $"); RCSID("$OpenBSD: readconf.c,v 1.134 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"

2
readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.63 2004/06/13 15:03:02 djm Exp $ */ /* $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>

2
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.134 2004/06/24 19:30:54 djm Exp $"); RCSID("$OpenBSD: servconf.c,v 1.135 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"

4
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.177 2004/06/30 08:36:59 djm Exp $"); RCSID("$OpenBSD: session.c,v 1.178 2004/07/11 17:48:47 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1320,7 +1320,7 @@ do_pwchange(Session *s)
{ {
fprintf(stderr, "WARNING: Your password has expired.\n"); fprintf(stderr, "WARNING: Your password has expired.\n");
if (s->ttyfd != -1) { if (s->ttyfd != -1) {
fprintf(stderr, fprintf(stderr,
"You must change your password now and login again!\n"); "You must change your password now and login again!\n");
execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL); execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
perror("passwd"); perror("passwd");

2
sftp-client.c
View File

@ -20,7 +20,7 @@
/* XXX: copy between two remote sites */ /* XXX: copy between two remote sites */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-client.c,v 1.50 2004/06/03 12:22:20 pedro Exp $"); RCSID("$OpenBSD: sftp-client.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"

2
sftp.c
View File

@ -16,7 +16,7 @@
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp.c,v 1.55 2004/06/25 23:21:38 djm Exp $"); RCSID("$OpenBSD: sftp.c,v 1.56 2004/07/11 17:48:47 deraadt Exp $");
#include "buffer.h" #include "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"

2
ssh-agent.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-agent.1,v 1.40 2004/05/13 02:47:50 dtucker Exp $ .\" $OpenBSD: ssh-agent.1,v 1.41 2004/07/11 17:48:47 deraadt Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland

2
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.116 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.117 2004/07/11 17:48:47 deraadt Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>

2
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $"); RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>

8
ssh1.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */ /* $OpenBSD: ssh1.h,v 1.4 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -29,8 +29,8 @@
#define SSH_SMSG_AUTH_RSA_CHALLENGE 7 /* int (BIGNUM) */ #define SSH_SMSG_AUTH_RSA_CHALLENGE 7 /* int (BIGNUM) */
#define SSH_CMSG_AUTH_RSA_RESPONSE 8 /* int (BIGNUM) */ #define SSH_CMSG_AUTH_RSA_RESPONSE 8 /* int (BIGNUM) */
#define SSH_CMSG_AUTH_PASSWORD 9 /* pass (string) */ #define SSH_CMSG_AUTH_PASSWORD 9 /* pass (string) */
#define SSH_CMSG_REQUEST_PTY 10 /* TERM, tty modes */ #define SSH_CMSG_REQUEST_PTY 10 /* TERM, tty modes */
#define SSH_CMSG_WINDOW_SIZE 11 /* row,col,xpix,ypix */ #define SSH_CMSG_WINDOW_SIZE 11 /* row,col,xpix,ypix */
#define SSH_CMSG_EXEC_SHELL 12 /* */ #define SSH_CMSG_EXEC_SHELL 12 /* */
#define SSH_CMSG_EXEC_CMD 13 /* cmd (string) */ #define SSH_CMSG_EXEC_CMD 13 /* cmd (string) */
#define SSH_SMSG_SUCCESS 14 /* */ #define SSH_SMSG_SUCCESS 14 /* */
@ -45,7 +45,7 @@
#define SSH_MSG_CHANNEL_DATA 23 /* ch,data (int,str) */ #define SSH_MSG_CHANNEL_DATA 23 /* ch,data (int,str) */
#define SSH_MSG_CHANNEL_CLOSE 24 /* channel (int) */ #define SSH_MSG_CHANNEL_CLOSE 24 /* channel (int) */
#define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* channel (int) */ #define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* channel (int) */
/* SSH_CMSG_X11_REQUEST_FORWARDING 26 OBSOLETE */ /* SSH_CMSG_X11_REQUEST_FORWARDING 26 OBSOLETE */
#define SSH_SMSG_X11_OPEN 27 /* channel (int) */ #define SSH_SMSG_X11_OPEN 27 /* channel (int) */
#define SSH_CMSG_PORT_FORWARD_REQUEST 28 /* p,host,hp (i,s,i) */ #define SSH_CMSG_PORT_FORWARD_REQUEST 28 /* p,host,hp (i,s,i) */
#define SSH_MSG_PORT_OPEN 29 /* ch,h,p (i,s,i) */ #define SSH_MSG_PORT_OPEN 29 /* ch,h,p (i,s,i) */

2
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.297 2004/06/26 20:07:16 avsm Exp $"); RCSID("$OpenBSD: sshd.c,v 1.298 2004/07/11 17:48:47 deraadt Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>

18
ttymodes.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ttymodes.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $ */ /* $OpenBSD: ttymodes.h,v 1.13 2004/07/11 17:48:47 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -113,17 +113,17 @@ TTYCHAR(VDISCARD, 18)
/* name, field, op */ /* name, field, op */
TTYMODE(IGNPAR, c_iflag, 30) TTYMODE(IGNPAR, c_iflag, 30)
TTYMODE(PARMRK, c_iflag, 31) TTYMODE(PARMRK, c_iflag, 31)
TTYMODE(INPCK, c_iflag, 32) TTYMODE(INPCK, c_iflag, 32)
TTYMODE(ISTRIP, c_iflag, 33) TTYMODE(ISTRIP, c_iflag, 33)
TTYMODE(INLCR, c_iflag, 34) TTYMODE(INLCR, c_iflag, 34)
TTYMODE(IGNCR, c_iflag, 35) TTYMODE(IGNCR, c_iflag, 35)
TTYMODE(ICRNL, c_iflag, 36) TTYMODE(ICRNL, c_iflag, 36)
#if defined(IUCLC) #if defined(IUCLC)
TTYMODE(IUCLC, c_iflag, 37) TTYMODE(IUCLC, c_iflag, 37)
#endif #endif
TTYMODE(IXON, c_iflag, 38) TTYMODE(IXON, c_iflag, 38)
TTYMODE(IXANY, c_iflag, 39) TTYMODE(IXANY, c_iflag, 39)
TTYMODE(IXOFF, c_iflag, 40) TTYMODE(IXOFF, c_iflag, 40)
#ifdef IMAXBEL #ifdef IMAXBEL
TTYMODE(IMAXBEL,c_iflag, 41) TTYMODE(IMAXBEL,c_iflag, 41)
#endif /* IMAXBEL */ #endif /* IMAXBEL */