- (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c

[openssh.git] / kexgex.c

diff --git a/kexgex.c b/kexgex.c
index df7e668b4ab4c8cc122a086ade82da8dd24d16ce..f21f310ee6e4b4524faa421af61a309f18f360b1 100644 (file)
--- a/kexgex.c
+++ b/kexgex.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgex.c,v 1.3 2001/04/04 09:48:34 markus Exp $");
+RCSID("$OpenBSD: kexgex.c,v 1.6 2001/06/07 20:23:04 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -57,8 +57,8 @@ kexgex_hash(
        EVP_MD_CTX md;
 
        buffer_init(&b);
-       buffer_put_string(&b, client_version_string, strlen(client_version_string));
-       buffer_put_string(&b, server_version_string, strlen(server_version_string));
+       buffer_put_cstring(&b, client_version_string);
+       buffer_put_cstring(&b, server_version_string);
 
        /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
        buffer_put_int(&b, ckexinitlen+1);
@@ -69,7 +69,7 @@ kexgex_hash(
        buffer_append(&b, skexinit, skexinitlen);
 
        buffer_put_string(&b, serverhostkeyblob, sbloblen);
-       if (min == -1 || max == -1) 
+       if (min == -1 || max == -1)
                buffer_put_int(&b, wantbits);
        else {
                buffer_put_int(&b, min);
@@ -205,7 +205,7 @@ kexgex_client(Kex *kex)
        kbuf = xmalloc(klen);
        kout = DH_compute_key(kbuf, dh_server_pub, dh);
 #ifdef DEBUG_KEXDH
-        dump_digest("shared secret", kbuf, kout);
+       dump_digest("shared secret", kbuf, kout);
 #endif
        shared_secret = BN_new();
        BN_bin2bn(kbuf, kout, shared_secret);
@@ -286,7 +286,7 @@ kexgex_server(Kex *kex)
                /* unused for old GEX */
                break;
        default:
-               fatal("protocol error during kex, no DH_GEX_REQUEST");
+               fatal("protocol error during kex, no DH_GEX_REQUEST: %d", type);
        }
        packet_done();
 
@@ -339,7 +339,7 @@ kexgex_server(Kex *kex)
        kbuf = xmalloc(klen);
        kout = DH_compute_key(kbuf, dh_client_pub, dh);
 #ifdef DEBUG_KEXDH
-        dump_digest("shared secret", kbuf, kout);
+       dump_digest("shared secret", kbuf, kout);
 #endif
        shared_secret = BN_new();
        BN_bin2bn(kbuf, kout, shared_secret);