Stupid djm commits experimental code to head instead of branch

[openssh.git] / kexdh.c

diff --git a/kexdh.c b/kexdh.c
index 6256722ff9d001815186a1d3747a39a80df225a1..eaf497ca7f1d8ff20628fddca017a58a5c160e47 100644 (file)
--- a/kexdh.c
+++ b/kexdh.c
@@ -37,12 +37,6 @@ RCSID("$OpenBSD: kexdh.c,v 1.17 2002/02/28 15:46:33 markus Exp $");
 #include "packet.h"
 #include "dh.h"
 #include "ssh2.h"
-#include "monitor.h"
-#include "monitor_wrap.h"
-
-/* Imports */
-extern int use_privsep;
-extern int mm_recvfd;
 
 static u_char *
 kex_dh_hash(
@@ -281,12 +275,7 @@ kexdh_server(Kex *kex)
 
        /* sign H */
        /* XXX hashlen depends on KEX */
-       if (use_privsep)
-               mm_key_sign(mm_recvfd,
-                   kex->host_key_index(server_host_key),
-                   &signature, &slen, hash, 20);
-       else
-               key_sign(server_host_key, &signature, &slen, hash, 20);
+       key_sign(server_host_key, &signature, &slen, hash, 20);
 
        /* destroy_sensitive_data(); */