summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-09-06 12:24:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-09-06 12:24:17 +0000
commite275f0e5a98bc1478877408aa18dd9a0041804d7 (patch)
tree8d828518f728d10d936ec18942ed94f9e59114ef /usr.bin/ssh
parent85290075ce9d1607d4ee7fbec228176a19d19171 (diff)
OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our
replacement anymore
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/kex.c6
-rw-r--r--usr.bin/ssh/lib/Makefile4
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index 28206467ff3..f87accf1fa1 100644
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.79 2007/06/05 06:52:37 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.80 2008/09/06 12:24:13 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -48,8 +48,6 @@
#define KEX_COOKIE_LEN 16
-extern const EVP_MD *evp_ssh_sha256(void);
-
/* prototype */
static void kex_kexinit_finish(Kex *);
static void kex_choose_conf(Kex *);
@@ -315,7 +313,7 @@ choose_kex(Kex *k, char *client, char *server)
k->evp_md = EVP_sha1();
} else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) {
k->kex_type = KEX_DH_GEX_SHA256;
- k->evp_md = evp_ssh_sha256();
+ k->evp_md = EVP_sha256();
} else
fatal("bad kex alg %s", k->name);
}
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile
index 3003c7e2cec..9a29b844b93 100644
--- a/usr.bin/ssh/lib/Makefile
+++ b/usr.bin/ssh/lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2008/06/10 03:57:27 djm Exp $
+# $OpenBSD: Makefile,v 1.57 2008/09/06 12:24:16 djm Exp $
.PATH: ${.CURDIR}/..
@@ -12,7 +12,7 @@ SRCS= authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c \
key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
- monitor_fdpass.c md-sha256.c umac.c addrmatch.c
+ monitor_fdpass.c umac.c addrmatch.c
DEBUGLIBS= no
NOPROFILE= yes