summaryrefslogtreecommitdiffstats
path: root/kexdhc.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-01-12 09:21:22 +0100
committerDamien Miller <djm@mindrot.org>2014-01-12 09:21:22 +0100
commit91b580e4bec55118bf96ab3cdbe5a50839e75d0a (patch)
tree32e4083c5a8cd285e1b0b13f9b77992db535cba4 /kexdhc.c
parent - djm@cvs.openbsd.org 2014/01/10 05:59:19 (diff)
downloadopenssh-91b580e4bec55118bf96ab3cdbe5a50839e75d0a.tar.xz
openssh-91b580e4bec55118bf96ab3cdbe5a50839e75d0a.zip
- djm@cvs.openbsd.org 2014/01/12 08:13:13
[bufaux.c buffer.h kex.c kex.h kexc25519.c kexc25519c.c kexc25519s.c] [kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c] avoid use of OpenSSL BIGNUM type and functions for KEX with Curve25519 by adding a buffer_put_bignum2_from_string() that stores a string using the bignum encoding rules. Will make it easier to build a reduced-feature OpenSSH without OpenSSL in the future; ok markus@
Diffstat (limited to 'kexdhc.c')
-rw-r--r--kexdhc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kexdhc.c b/kexdhc.c
index ccd137cac..78509af21 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhc.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: kexdhc.c,v 1.14 2014/01/12 08:13:13 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -155,7 +155,7 @@ kexdh_client(Kex *kex)
memcpy(kex->session_id, hash, kex->session_id_len);
}
- 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);
}