summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/kexdhs.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/kexdhs.c')
-rw-r--r--crypto/openssh/kexdhs.c8
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);
}
OpenPOWER on IntegriCloud