fix for AIX build problems from

[gssapi-openssh.git] / openssh / kexgexs.c

diff --git a/openssh/kexgexs.c b/openssh/kexgexs.c
index baebfcfb0fa85efe14d4a0e87ff0145e963d06db..a037f57f2814e2cc783239e42cea0aca1a114b58 100644 (file)
--- a/openssh/kexgexs.c
+++ b/openssh/kexgexs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: kexgexs.c,v 1.10 2006/11/06 21:25:28 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -24,16 +25,27 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgexs.c,v 1.1 2003/02/16 17:09:57 markus Exp $");
+
+#include <sys/param.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
 
 #include "xmalloc.h"
+#include "buffer.h"
 #include "key.h"
+#include "cipher.h"
 #include "kex.h"
 #include "log.h"
 #include "packet.h"
 #include "dh.h"
 #include "ssh2.h"
 #include "compat.h"
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
 #include "monitor_wrap.h"
 
 void
@@ -43,8 +55,8 @@ kexgex_server(Kex *kex)
        Key *server_host_key;
        DH *dh;
        u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-       u_int sbloblen, klen, kout, slen;
-       int min = -1, max = -1, nbits = -1, type;
+       u_int sbloblen, klen, slen, hashlen;
+       int min = -1, max = -1, nbits = -1, type, kout;
 
        if (kex->load_host_key == NULL)
                fatal("Cannot load hostkey");
@@ -122,13 +134,15 @@ kexgex_server(Kex *kex)
 
        klen = DH_size(dh);
        kbuf = xmalloc(klen);
-       kout = DH_compute_key(kbuf, dh_client_pub, dh);
+       if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0)
+               fatal("DH_compute_key: failed");
 #ifdef DEBUG_KEXDH
        dump_digest("shared secret", kbuf, kout);
 #endif
        if ((shared_secret = BN_new()) == NULL)
                fatal("kexgex_server: BN_new failed");
-       BN_bin2bn(kbuf, kout, shared_secret);
+       if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
+               fatal("kexgex_server: BN_bin2bn failed");
        memset(kbuf, 0, klen);
        xfree(kbuf);
 
@@ -137,8 +151,9 @@ kexgex_server(Kex *kex)
        if (type == SSH2_MSG_KEX_DH_GEX_REQUEST_OLD)
                min = max = -1;
 
-       /* calc H */                    /* XXX depends on 'kex' */
-       hash = kexgex_hash(
+       /* calc H */
+       kexgex_hash(
+           kex->evp_md,
            kex->client_version_string,
            kex->server_version_string,
            buffer_ptr(&kex->peer), buffer_len(&kex->peer),
@@ -148,21 +163,20 @@ kexgex_server(Kex *kex)
            dh->p, dh->g,
            dh_client_pub,
            dh->pub_key,
-           shared_secret
+           shared_secret,
+           &hash, &hashlen
        );
        BN_clear_free(dh_client_pub);
 
        /* save session id := H */
-       /* XXX hashlen depends on KEX */
        if (kex->session_id == NULL) {
-               kex->session_id_len = 20;
+               kex->session_id_len = hashlen;
                kex->session_id = xmalloc(kex->session_id_len);
                memcpy(kex->session_id, hash, kex->session_id_len);
        }
 
        /* sign H */
-       /* XXX hashlen depends on KEX */
-       PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, 20));
+       PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, hashlen));
 
        /* destroy_sensitive_data(); */
 
@@ -179,7 +193,7 @@ kexgex_server(Kex *kex)
        /* have keys, free DH */
        DH_free(dh);
 
-       kex_derive_keys(kex, hash, shared_secret);
+       kex_derive_keys(kex, hash, hashlen, shared_secret);
        BN_clear_free(shared_secret);
 
        kex_finish(kex);