- 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@

1 files changed, 2 insertions, 2 deletions

diff --git a/kexecdhs.c b/kexecdhs.c
index d1dd8c7fb..6fbb79c9d 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhs.c,v 1.8 2014/01/09 23:20:00 djm Exp $ */
+/* $OpenBSD: kexecdhs.c,v 1.9 2014/01/12 08:13:13 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -148,7 +148,7 @@ kexecdh_server(Kex *kex)
         /* have keys, free server key */
         EC_KEY_free(server_key);
 
-        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);
 }