1 files changed, 6 insertions, 11 deletions

diff --git a/kexgexs.c b/kexgexs.c
index a5e3df7bc..4e473fc73 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.14 2010/11/10 01:33:07 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.16 2013/07/19 07:37:48 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -68,10 +68,6 @@ kexgex_server(Kex *kex)
         if (server_host_public == NULL)
                 fatal("Unsupported hostkey type %d", kex->hostkey_type);
         server_host_private = kex->load_host_private_key(kex->hostkey_type);
-        if (server_host_private == NULL)
-                fatal("Missing private key for hostkey type %d",
-                    kex->hostkey_type);
-
 
         type = packet_read();
         switch (type) {
@@ -155,7 +151,7 @@ kexgex_server(Kex *kex)
         if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
                 fatal("kexgex_server: BN_bin2bn failed");
         memset(kbuf, 0, klen);
-        xfree(kbuf);
+        free(kbuf);
 
         key_to_blob(server_host_public, &server_host_key_blob, &sbloblen);
 
@@ -187,9 +183,8 @@ kexgex_server(Kex *kex)
         }
 
         /* sign H */
-        if (PRIVSEP(key_sign(server_host_private, &signature, &slen, hash,
-            hashlen)) < 0)
-                fatal("kexgex_server: key_sign failed");
+        kex->sign(server_host_private, server_host_public, &signature, &slen,
+            hash, hashlen);
 
         /* destroy_sensitive_data(); */
 
@@ -201,8 +196,8 @@ kexgex_server(Kex *kex)
         packet_put_string(signature, slen);
         packet_send();
 
-        xfree(signature);
-        xfree(server_host_key_blob);
+        free(signature);
+        free(server_host_key_blob);
         /* have keys, free DH */
         DH_free(dh);