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

- Merged OpenBSD updates to include paths.

This commit is contained in:
Damien Miller 2000-04-13 12:26:34 +10:00
parent e71eb91259
commit 22c772609a
26 changed files with 131 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
20000413
- INSTALL doc updates
- Merged OpenBSD updates to include paths.
20000412
- OpenBSD CVS updates:

2
auth-rh-rsa.c
View File

@ -15,7 +15,7 @@
*/
#include "includes.h"
RCSID("$Id: auth-rh-rsa.c,v 1.8 2000/03/26 03:04:52 damien Exp $");
RCSID("$Id: auth-rh-rsa.c,v 1.9 2000/04/13 02:26:35 damien Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>

2
auth-rsa.c
View File

@ -16,7 +16,7 @@
*/
#include "includes.h"
RCSID("$Id: auth-rsa.c,v 1.14 2000/03/26 03:04:52 damien Exp $");
RCSID("$Id: auth-rsa.c,v 1.15 2000/04/13 02:26:35 damien Exp $");
#include "rsa.h"
#include "packet.h"

2
authfd.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$Id: authfd.c,v 1.10 1999/12/16 02:18:04 damien Exp $");
RCSID("$Id: authfd.c,v 1.11 2000/04/13 02:26:35 damien Exp $");
#include "ssh.h"
#include "rsa.h"

2
authfile.c
View File

@ -15,7 +15,7 @@
*/
#include "includes.h"
RCSID("$Id: authfile.c,v 1.8 2000/04/06 02:32:38 damien Exp $");
RCSID("$Id: authfile.c,v 1.9 2000/04/13 02:26:36 damien Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>

2
bufaux.c
View File

@ -17,7 +17,7 @@
*/
#include "includes.h"
RCSID("$Id: bufaux.c,v 1.9 2000/04/01 01:09:23 damien Exp $");
RCSID("$Id: bufaux.c,v 1.10 2000/04/13 02:26:36 damien Exp $");
#include "ssh.h"

8
buffer.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$Id: buffer.c,v 1.3 1999/11/25 00:54:58 damien Exp $");
RCSID("$Id: buffer.c,v 1.4 2000/04/13 02:26:36 damien Exp $");
#include "xmalloc.h"
#include "buffer.h"
@ -114,7 +114,7 @@ void
buffer_get(Buffer *buffer, char *buf, unsigned int len)
{
if (len > buffer->end - buffer->offset)
fatal("buffer_get trying to get more bytes than in buffer");
fatal("buffer_get: trying to get more bytes than in buffer");
memcpy(buf, buffer->buf + buffer->offset, len);
buffer->offset += len;
}
@ -125,7 +125,7 @@ void
buffer_consume(Buffer *buffer, unsigned int bytes)
{
if (bytes > buffer->end - buffer->offset)
fatal("buffer_get trying to get more bytes than in buffer");
fatal("buffer_consume: trying to get more bytes than in buffer");
buffer->offset += bytes;
}
@ -135,7 +135,7 @@ void
buffer_consume_end(Buffer *buffer, unsigned int bytes)
{
if (bytes > buffer->end - buffer->offset)
fatal("buffer_get trying to get more bytes than in buffer");
fatal("buffer_consume_end: trying to get more bytes than in buffer");
buffer->end -= bytes;
}

2
cipher.c
View File

@ -12,7 +12,7 @@
*/
#include "includes.h"
RCSID("$Id: cipher.c,v 1.17 2000/04/12 10:17:39 damien Exp $");
RCSID("$Id: cipher.c,v 1.18 2000/04/13 02:26:36 damien Exp $");
#include "ssh.h"
#include "cipher.h"

2
cipher.h
View File

@ -11,7 +11,7 @@
*
*/
/* RCSID("$Id: cipher.h,v 1.9 2000/04/12 10:17:39 damien Exp $"); */
/* RCSID("$Id: cipher.h,v 1.10 2000/04/13 02:26:36 damien Exp $"); */
#ifndef CIPHER_H
#define CIPHER_H

2
dsa.c
View File

@ -28,7 +28,7 @@
*/
#include "includes.h"
RCSID("$Id: dsa.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
RCSID("$Id: dsa.c,v 1.3 2000/04/12 09:39:10 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"

2
hmac.c
View File

@ -28,7 +28,7 @@
*/
#include "includes.h"
RCSID("$Id: hmac.c,v 1.1 2000/04/03 20:06:15 markus Exp $");
RCSID("$Id: hmac.c,v 1.2 2000/04/12 09:39:10 markus Exp $");
#include "xmalloc.h"
#include "ssh.h"

2
hostfile.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: hostfile.c,v 1.14 2000/03/23 22:15:33 markus Exp $");
RCSID("$OpenBSD: hostfile.c,v 1.15 2000/04/12 09:39:10 markus Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>

2
kex.c
View File

@ -28,7 +28,7 @@
*/
#include "includes.h"
RCSID("$Id: kex.c,v 1.3 2000/04/12 10:17:39 damien Exp $");
RCSID("$Id: kex.c,v 1.4 2000/04/13 02:26:36 damien Exp $");
#include "ssh.h"
#include "ssh2.h"

2
mpaux.c
View File

@ -15,7 +15,7 @@
*/
#include "includes.h"
RCSID("$Id: mpaux.c,v 1.9 2000/04/01 01:09:24 damien Exp $");
RCSID("$Id: mpaux.c,v 1.10 2000/04/13 02:26:36 damien Exp $");
#include "getput.h"
#include "xmalloc.h"

2
packet.c
View File

@ -17,7 +17,7 @@
*/
#include "includes.h"
RCSID("$Id: packet.c,v 1.16 2000/04/06 02:32:40 damien Exp $");
RCSID("$Id: packet.c,v 1.17 2000/04/13 02:26:37 damien Exp $");
#ifdef HAVE_OPENSSL
# include <openssl/bn.h>

2
packet.h
View File

@ -13,7 +13,7 @@
*
*/
/* RCSID("$Id: packet.h,v 1.12 2000/04/06 02:32:40 damien Exp $"); */
/* RCSID("$Id: packet.h,v 1.13 2000/04/13 02:26:37 damien Exp $"); */
#ifndef PACKET_H
#define PACKET_H

2
rsa.h
View File

@ -13,7 +13,7 @@
*
*/
/* RCSID("$Id: rsa.h,v 1.6 2000/01/29 09:40:22 damien Exp $"); */
/* RCSID("$Id: rsa.h,v 1.7 2000/04/13 02:26:37 damien Exp $"); */
#ifndef RSA_H
#define RSA_H

2
scp.1
View File

@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
.\" $Id: scp.1,v 1.6 2000/03/26 03:04:53 damien Exp $
.\" $Id: scp.1,v 1.7 2000/04/13 02:26:37 damien Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1

2
ssh-add.1
View File

@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 23:55:14 1995 ylo
.\"
.\" $Id: ssh-add.1,v 1.10 2000/03/26 03:04:53 damien Exp $
.\" $Id: ssh-add.1,v 1.11 2000/04/13 02:26:37 damien Exp $
.\"
.Dd September 25, 1999
.Dt SSH-ADD 1

2
ssh-agent.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-agent.1,v 1.10 2000/03/23 21:10:10 aaron Exp $
.\" $OpenBSD: ssh-agent.1,v 1.11 2000/04/12 21:47:50 aaron Exp $
.\"
.\" -*- nroff -*-
.\"

4
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $ */
/* $OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -9,7 +9,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $");
RCSID("$OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $");
#include "ssh.h"
#include "rsa.h"

2
ssh-keygen.1
View File

@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 23:55:14 1995 ylo
.\"
.\" $Id: ssh-keygen.1,v 1.10 2000/03/26 03:04:53 damien Exp $
.\" $Id: ssh-keygen.1,v 1.11 2000/04/13 02:26:37 damien Exp $
.\"
.Dd September 25, 1999
.Dt SSH-KEYGEN 1

19
ssh.1
View File

@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 21:55:14 1995 ylo
.\"
.\" $Id: ssh.1,v 1.20 2000/03/26 03:04:54 damien Exp $
.\" $Id: ssh.1,v 1.21 2000/04/13 02:26:37 damien Exp $
.\"
.Dd September 25, 1999
.Dt SSH 1
@ -548,6 +548,12 @@ and
are supported.
The default is
.Dq 3des .
.It Cm Ciphers
Specifies the ciphers allowed for protocol version 2
in order of preference.
Multiple ciphers must be comma-separated.
The default is
.Dq blowfish-cbc,3des-cbc,arcfour,cast128-cbc .
.It Cm Compression
Specifies whether to use compression.
The argument must be
@ -697,6 +703,17 @@ or
.It Cm Port
Specifies the port number to connect on the remote host.
Default is 22.
.It Cm Protocol
Specifies the protocol versions
.Nm
should support in order of preference.
The possible values are
.Dq 1
and
.Dq 2 .
Multiple versions must be comma-separated.
The default is
.Dq 1 .
.It Cm ProxyCommand
Specifies the command to use to connect to the server.
The command

2
sshconnect.c
View File

@ -10,7 +10,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.65 2000/04/12 07:56:16 markus Exp $");
RCSID("$OpenBSD: sshconnect.c,v 1.66 2000/04/12 09:39:10 markus Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>

18
sshd.8
View File

@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 21:55:14 1995 ylo
.\"
.\" $Id: sshd.8,v 1.16 2000/04/01 01:09:27 damien Exp $
.\" $Id: sshd.8,v 1.17 2000/04/13 02:26:38 damien Exp $
.\"
.Dd September 25, 1999
.Dt SSHD 8
@ -246,6 +246,11 @@ wildcards in the patterns.
Only user names are valid, a numerical user ID isn't recognized.
By default login is allowed regardless of the user name.
.Pp
.It Cm Ciphers
Specifies the ciphers allowed for protocol version 2.
Multiple ciphers must be comma-separated.
The default is
.Dq blowfish-cbc,3des-cbc,arcfour,cast128-cbc .
.It Cm CheckMail
Specifies whether
.Nm
@ -427,6 +432,17 @@ when a user logs in interactively.
or equivalent.)
The default is
.Dq yes .
.It Cm Protocol
Specifies the protocol versions
.Nm
should support.
The possible values are
.Dq 1
and
.Dq 2 .
Multiple versions must be comma-separated.
The default is
.Dq 1 .
.It Cm RandomSeed
Obsolete.
Random number generation uses other techniques.

2
sshd.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.103 2000/04/12 08:11:36 markus Exp $");
RCSID("$OpenBSD: sshd.c,v 1.104 2000/04/12 09:39:10 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"