diff options
| author | des <des@FreeBSD.org> | 2014-02-27 17:29:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-02-27 17:29:02 +0000 |
| commit | 255d8413daf4c3747aeb37e6a71bf2771beed29d (patch) | |
| tree | 28087af50eaf299f287c7fe4b7050c317771c89e /crypto/openssh/kexdhs.c | |
| parent | ea1005cca47f4d3aace134a0acd6809943e46acc (diff) | |
| download | FreeBSD-src-255d8413daf4c3747aeb37e6a71bf2771beed29d.zip FreeBSD-src-255d8413daf4c3747aeb37e6a71bf2771beed29d.tar.gz | |
MFH (r261320): upgrade openssh to 6.5p1
MFH (r261340): enable sandboxing by default
Diffstat (limited to 'crypto/openssh/kexdhs.c')
| -rw-r--r-- | crypto/openssh/kexdhs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/openssh/kexdhs.c b/crypto/openssh/kexdhs.c index 269d809..d2c7adc 100644 --- a/crypto/openssh/kexdhs.c +++ b/crypto/openssh/kexdhs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexdhs.c,v 1.14 2013/07/19 07:37:48 markus Exp $ */ +/* $OpenBSD: kexdhs.c,v 1.17 2014/01/12 08:13:13 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -42,10 +42,6 @@ #include "packet.h" #include "dh.h" #include "ssh2.h" -#ifdef GSSAPI -#include "ssh-gss.h" -#endif -#include "monitor_wrap.h" void kexdh_server(Kex *kex) @@ -158,7 +154,7 @@ kexdh_server(Kex *kex) /* have keys, free DH */ DH_free(dh); - kex_derive_keys(kex, hash, hashlen, shared_secret); + kex_derive_keys_bn(kex, hash, hashlen, shared_secret); BN_clear_free(shared_secret); kex_finish(kex); } |
