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 @@
      log functions should not be passed strings that end in newline as they
      get passed on to syslog() and when logging to stderr, do_log() appends
      its own newline.
+   - deraadt@cvs.openbsd.org 2001/03/04 18:21:28
+     [sshd.8]
+     list SSH2 ciphers
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4357,4 +4360,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.902 2001/03/05 07:47:23 mouring Exp $
+$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 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.102 2001/03/04 12:54:04 stevesk Exp $
+.\" $OpenBSD: sshd.8,v 1.103 2001/03/04 18:21:28 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -134,9 +134,8 @@ Each host has a host-specific DSA key used to identify the host.
 However, when the daemon starts, it does not generate a server key.
 Forward security is provided through a Diffie-Hellman key agreement.
 This key agreement results in a shared session key.
-The rest of the session is encrypted
-using a symmetric cipher, currently
-Blowfish, 3DES or CAST128 in CBC mode or Arcfour.
+The rest of the session is encrypted using a symmetric cipher, currently
+Blowfish, 3DES, CAST128, Arcfour, 128 bit AES, or 256 bit AES.
 The client selects the encryption algorithm
 to use from those offered by the server.
 Additionally, session integrity is provided