summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-25 23:39:29 +1100
committerDamien Miller <djm@mindrot.org>2006-03-25 23:39:29 +1100
commit3e96d742743b150025588b7200c7998d7e4ec2c6 (patch)
treef42b19378d0480fc07bcebff6781342e64e75db9
parent9834cab32ef1abd8f0e4e74852ac52c35cfce0ef (diff)
- djm@cvs.openbsd.org 2006/03/16 04:24:42
[ssh.1] Add RFC4419 (Diffie-Hellman group exchange KEX) to the list of SSH RFCs that OpenSSH supports
-rw-r--r--ChangeLog9
-rw-r--r--ssh.17
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 342844d3..2281accd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060325
+ - OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2006/03/16 04:24:42
+ [ssh.1]
+ Add RFC4419 (Diffie-Hellman group exchange KEX) to the list of SSH RFCs
+ that OpenSSH supports
+
20060318
- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
elad AT NetBSD.org
@@ -4189,4 +4196,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4230 2006/03/18 13:07:07 dtucker Exp $
+$Id: ChangeLog,v 1.4231 2006/03/25 12:39:29 djm Exp $
diff --git a/ssh.1 b/ssh.1
index e66ad9e8..139b0015 100644
--- a/ssh.1
+++ b/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.257 2006/02/24 20:31:30 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.258 2006/03/16 04:24:42 djm Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1388,6 +1388,11 @@ manual page for more information.
.%T "Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol"
.%D 2006
.Re
+.Rs
+.%R RFC 4419
+.%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"
+.%D 2006
+.Re
.Sh AUTHORS
OpenSSH is a derivative of the original and free
ssh 1.2.12 release by Tatu Ylonen.