summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.87
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a726baf0c..095c560d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -165,6 +165,9 @@
165 log functions should not be passed strings that end in newline as they 165 log functions should not be passed strings that end in newline as they
166 get passed on to syslog() and when logging to stderr, do_log() appends 166 get passed on to syslog() and when logging to stderr, do_log() appends
167 its own newline. 167 its own newline.
168 - deraadt@cvs.openbsd.org 2001/03/04 18:21:28
169 [sshd.8]
170 list SSH2 ciphers
168 171
16920010304 17220010304
170 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 173 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4357,4 +4360,4 @@
4357 - Wrote replacements for strlcpy and mkdtemp 4360 - Wrote replacements for strlcpy and mkdtemp
4358 - Released 1.0pre1 4361 - Released 1.0pre1
4359 4362
4360$Id: ChangeLog,v 1.902 2001/03/05 07:47:23 mouring Exp $ 4363$Id: ChangeLog,v 1.903 2001/03/05 07:48:45 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index cfbe90ad8..52e902ef7 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.102 2001/03/04 12:54:04 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.103 2001/03/04 18:21:28 deraadt Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -134,9 +134,8 @@ Each host has a host-specific DSA key used to identify the host.
134However, when the daemon starts, it does not generate a server key. 134However, when the daemon starts, it does not generate a server key.
135Forward security is provided through a Diffie-Hellman key agreement. 135Forward security is provided through a Diffie-Hellman key agreement.
136This key agreement results in a shared session key. 136This key agreement results in a shared session key.
137The rest of the session is encrypted 137The rest of the session is encrypted using a symmetric cipher, currently
138using a symmetric cipher, currently 138Blowfish, 3DES, CAST128, Arcfour, 128 bit AES, or 256 bit AES.
139Blowfish, 3DES or CAST128 in CBC mode or Arcfour.
140The client selects the encryption algorithm 139The client selects the encryption algorithm
141to use from those offered by the server. 140to use from those offered by the server.
142Additionally, session integrity is provided 141Additionally, session integrity is provided