diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2001-01-04 22:35:33 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2001-01-04 22:35:33 +0000 |
commit | 524630b3eebdfa09d1253045bf157c184d05a118 (patch) | |
tree | 8d52ccf39d00ca3a3d93fa25db6db007e7d8f979 /usr.bin | |
parent | 73b85e671df4bc30298838174564156e3322f84c (diff) |
Mention AES as available SSH2 Cipher; ok markus
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/ssh/ssh.1 | 4 | ||||
-rw-r--r-- | usr.bin/ssh/sshd.8 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 40cb6dfa8b4..f25c2998721 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -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: ssh.1,v 1.74 2000/12/27 12:30:20 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.75 2001/01/04 22:35:32 djm Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -664,7 +664,7 @@ Specifies the ciphers allowed for protocol version 2 in order of preference. Multiple ciphers must be comma-separated. The default is -.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour . +.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . .It Cm Compression Specifies whether to use compression. The argument must be diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index ba1cfa9f092..6078216b98c 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/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.77 2001/01/04 22:25:58 markus Exp $ +.\" $OpenBSD: sshd.8,v 1.78 2001/01/04 22:35:32 djm Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -337,7 +337,7 @@ By default login is allowed regardless of the user name. Specifies the ciphers allowed for protocol version 2. Multiple ciphers must be comma-separated. The default is -.Dq 3des-cbc,blowfish-cbc,arcfour,cast128-cbc . +.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . .It Cm CheckMail Specifies whether .Nm |