summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:19:12 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:19:12 +1100
commit15bce6b8f0e7280aaf26b97a316a991990fc0ca0 (patch)
tree96604006b765a16d9046600c5033a20e043cdac9
parentad793d59a95a3b69f705c46bcf4f6e720b65f32f (diff)
- djm@cvs.openbsd.org 2008/09/06 12:24:13
[kex.c] OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our replacement anymore (ID sync only for portable - we still need this)
-rw-r--r--ChangeLog7
-rw-r--r--kex.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bfe8ea10..975b305be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,11 @@
22 [session.c] 22 [session.c]
23 allow ForceCommand internal-sftp with arguments. based on patch from 23 allow ForceCommand internal-sftp with arguments. based on patch from
24 michael.barabanov AT gmail.com; ok markus@ 24 michael.barabanov AT gmail.com; ok markus@
25 - djm@cvs.openbsd.org 2008/09/06 12:24:13
26 [kex.c]
27 OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our
28 replacement anymore
29 (ID sync only for portable - we still need this)
25 30
2620080906 3120080906
27 - (dtucker) [config.guess config.sub] Update to latest versions from 32 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4756,4 +4761,4 @@
4756 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4761 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4757 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4762 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4758 4763
4759$Id: ChangeLog,v 1.5104 2008/11/03 08:17:57 djm Exp $ 4764$Id: ChangeLog,v 1.5105 2008/11/03 08:19:12 djm Exp $
diff --git a/kex.c b/kex.c
index 332fadf6e..48b54f5f7 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.79 2007/06/05 06:52:37 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.80 2008/09/06 12:24:13 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *