1 files changed, 318 insertions, 144 deletions

diff --git a/kexgsss.c b/kexgsss.c
index 18070f1d7..60bc02deb 100644
--- a/kexgsss.c
+++ b/kexgsss.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-#ifdef GSSAPI
+#if defined(GSSAPI) && defined(WITH_OPENSSL)
 
 #include <string.h>
 
@@ -42,40 +42,41 @@
 #include "dh.h"
 #include "ssh-gss.h"
 #include "monitor_wrap.h"
-#include "misc.h"
+#include "misc.h"      /* servconf.h needs misc.h for struct ForwardOptions */
 #include "servconf.h"
+#include "ssh-gss.h"
 #include "digest.h"
+#include "ssherr.h"
 
 extern ServerOptions options;
 
 int
 kexgss_server(struct ssh *ssh)
 {
+        struct kex *kex = ssh->kex;
         OM_uint32 maj_status, min_status;
-        
-        /* 
+
+        /*
          * Some GSSAPI implementations use the input value of ret_flags (an
-         * output variable) as a means of triggering mechanism specific 
-         * features. Initializing it to zero avoids inadvertently 
-         * activating this non-standard behaviour.
+         * output variable) as a means of triggering mechanism specific
+         * features. Initializing it to zero avoids inadvertently
+         * activating this non-standard behaviour.
          */
 
         OM_uint32 ret_flags = 0;
         gss_buffer_desc gssbuf, recv_tok, msg_tok;
         gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
         Gssctxt *ctxt = NULL;
-        u_int slen, klen, kout;
-        u_char *kbuf;
-        DH *dh;
-        int min = -1, max = -1, nbits = -1;
-        const BIGNUM *pub_key, *dh_p, *dh_g;
-        BIGNUM *shared_secret = NULL;
-        BIGNUM *dh_client_pub = NULL;
+        struct sshbuf *shared_secret = NULL;
+        struct sshbuf *client_pubkey = NULL;
+        struct sshbuf *server_pubkey = NULL;
+        struct sshbuf *empty = sshbuf_new();
         int type = 0;
         gss_OID oid;
         char *mechs;
         u_char hash[SSH_DIGEST_MAX_LENGTH];
         size_t hashlen;
+        int r;
 
         /* Initialise GSSAPI */
 
@@ -88,8 +89,8 @@ kexgss_server(struct ssh *ssh)
                 free(mechs);
         }
 
-        debug2("%s: Identifying %s", __func__, ssh->kex->name);
-        oid = ssh_gssapi_id_kex(NULL, ssh->kex->name, ssh->kex->kex_type);
+        debug2("%s: Identifying %s", __func__, kex->name);
+        oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
         if (oid == GSS_C_NO_OID)
            fatal("Unknown gssapi mechanism");
 
@@ -98,94 +99,82 @@ kexgss_server(struct ssh *ssh)
         if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
                 fatal("Unable to acquire credentials for the server");
 
-        switch (ssh->kex->kex_type) {
-        case KEX_GSS_GRP1_SHA1:
-                dh = dh_new_group1();
-                break;
-        case KEX_GSS_GRP14_SHA1:
-                dh = dh_new_group14();
-                break;
-        case KEX_GSS_GEX_SHA1:
-                debug("Doing group exchange");
-                packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
-                min = packet_get_int();
-                nbits = packet_get_int();
-                max = packet_get_int();
-                packet_check_eom();
-                if (max < min || nbits < min || max < nbits)
-                        fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
-                            min, nbits, max);
-                dh = PRIVSEP(choose_dh(MAX(DH_GRP_MIN, min),
-                    nbits, MIN(DH_GRP_MAX, max)));
-                if (dh == NULL)
-                        packet_disconnect("Protocol error: no matching group found");
-                DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
-
-                packet_start(SSH2_MSG_KEXGSS_GROUP);
-                packet_put_bignum2(dh_p);
-                packet_put_bignum2(dh_g);
-                packet_send();
-
-                packet_write_wait();
-                break;
-        default:
-                fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
-        }
-
-        dh_gen_key(dh, ssh->kex->we_need * 8);
-
         do {
-                debug("Wait SSH2_MSG_GSSAPI_INIT");
-                type = packet_read();
+                debug("Wait SSH2_MSG_KEXGSS_INIT");
+                type = ssh_packet_read(ssh);
                 switch(type) {
                 case SSH2_MSG_KEXGSS_INIT:
-                        if (dh_client_pub != NULL) 
+                        if (client_pubkey != NULL)
                                 fatal("Received KEXGSS_INIT after initialising");
-                        recv_tok.value = packet_get_string(&slen);
-                        recv_tok.length = slen; 
-
-                        if ((dh_client_pub = BN_new()) == NULL)
-                                fatal("dh_client_pub == NULL");
-
-                        packet_get_bignum2(dh_client_pub);
+                        if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
+                                &recv_tok)) != 0 ||
+                            (r = sshpkt_getb_froms(ssh, &client_pubkey)) != 0 ||
+                            (r = sshpkt_get_end(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
+
+                        switch (kex->kex_type) {
+                        case KEX_GSS_GRP1_SHA1:
+                        case KEX_GSS_GRP14_SHA1:
+                        case KEX_GSS_GRP14_SHA256:
+                        case KEX_GSS_GRP16_SHA512:
+                                r = kex_dh_enc(kex, client_pubkey, &server_pubkey,
+                                    &shared_secret);
+                                break;
+                        case KEX_GSS_NISTP256_SHA256:
+                                r = kex_ecdh_enc(kex, client_pubkey, &server_pubkey,
+                                    &shared_secret);
+                                break;
+                        case KEX_GSS_C25519_SHA256:
+                                r = kex_c25519_enc(kex, client_pubkey, &server_pubkey,
+                                    &shared_secret);
+                                break;
+                        default:
+                                fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
+                        }
+                        if (r != 0)
+                                goto out;
 
                         /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
                         break;
                 case SSH2_MSG_KEXGSS_CONTINUE:
-                        recv_tok.value = packet_get_string(&slen);
-                        recv_tok.length = slen; 
+                        if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
+                                &recv_tok)) != 0 ||
+                            (r = sshpkt_get_end(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
                         break;
                 default:
-                        packet_disconnect(
+                        sshpkt_disconnect(ssh,
                             "Protocol error: didn't expect packet type %d",
                             type);
                 }
 
-                maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, 
+                maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
                     &send_tok, &ret_flags));
 
-                free(recv_tok.value);
+                gss_release_buffer(&min_status, &recv_tok);
 
                 if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
                         fatal("Zero length token output when incomplete");
 
-                if (dh_client_pub == NULL)
+                if (client_pubkey == NULL)
                         fatal("No client public key");
-                
+
                 if (maj_status & GSS_S_CONTINUE_NEEDED) {
                         debug("Sending GSSAPI_CONTINUE");
-                        packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-                        packet_put_string(send_tok.value, send_tok.length);
-                        packet_send();
+                        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
+                            (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
+                            (r = sshpkt_send(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
                         gss_release_buffer(&min_status, &send_tok);
                 }
         } while (maj_status & GSS_S_CONTINUE_NEEDED);
 
         if (GSS_ERROR(maj_status)) {
                 if (send_tok.length > 0) {
-                        packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-                        packet_put_string(send_tok.value, send_tok.length);
-                        packet_send();
+                        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
+                            (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
+                            (r = sshpkt_send(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
                 }
                 fatal("accept_ctx died");
         }
@@ -195,106 +184,291 @@ kexgss_server(struct ssh *ssh)
 
         if (!(ret_flags & GSS_C_INTEG_FLAG))
                 fatal("Integrity flag wasn't set");
-        
-        if (!dh_pub_is_valid(dh, dh_client_pub))
-                packet_disconnect("bad client public DH value");
 
-        klen = DH_size(dh);
-        kbuf = xmalloc(klen); 
-        kout = DH_compute_key(kbuf, dh_client_pub, dh);
-        if (kout < 0)
-                fatal("DH_compute_key: failed");
+        hashlen = sizeof(hash);
+        if ((r = kex_gen_hash(
+            kex->hash_alg,
+            kex->client_version,
+            kex->server_version,
+            kex->peer,
+            kex->my,
+            empty,
+            client_pubkey,
+            server_pubkey,
+            shared_secret,
+            hash, &hashlen)) != 0)
+                goto out;
+
+        gssbuf.value = hash;
+        gssbuf.length = hashlen;
 
-        shared_secret = BN_new();
-        if (shared_secret == NULL)
-                fatal("kexgss_server: BN_new failed");
+        if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt, &gssbuf, &msg_tok))))
+                fatal("Couldn't get MIC");
 
-        if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
-                fatal("kexgss_server: BN_bin2bn failed");
+        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_COMPLETE)) != 0 ||
+            (r = sshpkt_put_stringb(ssh, server_pubkey)) != 0 ||
+            (r = sshpkt_put_string(ssh, msg_tok.value, msg_tok.length)) != 0)
+                fatal("sshpkt failed: %s", ssh_err(r));
 
-        memset(kbuf, 0, klen);
-        free(kbuf);
+        if (send_tok.length != 0) {
+                if ((r = sshpkt_put_u8(ssh, 1)) != 0 || /* true */
+                    (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0)
+                        fatal("sshpkt failed: %s", ssh_err(r));
+        } else {
+                if ((r = sshpkt_put_u8(ssh, 0)) != 0) /* false */
+                        fatal("sshpkt failed: %s", ssh_err(r));
+        }
+        if ((r = sshpkt_send(ssh)) != 0)
+                fatal("sshpkt_send failed: %s", ssh_err(r));
 
-        DH_get0_key(dh, &pub_key, NULL);
-        DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
+        gss_release_buffer(&min_status, &send_tok);
+        gss_release_buffer(&min_status, &msg_tok);
 
-        hashlen = sizeof(hash);
-        switch (ssh->kex->kex_type) {
-        case KEX_GSS_GRP1_SHA1:
-        case KEX_GSS_GRP14_SHA1:
-                kex_dh_hash(
-                    ssh->kex->hash_alg,
-                    ssh->kex->client_version_string, ssh->kex->server_version_string,
-                    sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
-                    sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
-                    NULL, 0, /* Change this if we start sending host keys */
-                    dh_client_pub, pub_key, shared_secret,
-                    hash, &hashlen
-                );
-                break;
-        case KEX_GSS_GEX_SHA1:
-                kexgex_hash(
-                    ssh->kex->hash_alg,
-                    ssh->kex->client_version_string, ssh->kex->server_version_string,
-                    sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
-                    sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
-                    NULL, 0,
-                    min, nbits, max,
-                    dh_p, dh_g,
-                    dh_client_pub,
-                    pub_key,
-                    shared_secret,
-                    hash, &hashlen
-                );
-                break;
-        default:
-                fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
+        if (gss_kex_context == NULL)
+                gss_kex_context = ctxt;
+        else
+                ssh_gssapi_delete_ctx(&ctxt);
+
+        if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
+                r = kex_send_newkeys(ssh);
+
+        /* If this was a rekey, then save out any delegated credentials we
+         * just exchanged.  */
+        if (options.gss_store_rekey)
+                ssh_gssapi_rekey_creds();
+out:
+        sshbuf_free(empty);
+        explicit_bzero(hash, sizeof(hash));
+        sshbuf_free(shared_secret);
+        sshbuf_free(client_pubkey);
+        sshbuf_free(server_pubkey);
+        return r;
+}
+
+int
+kexgssgex_server(struct ssh *ssh)
+{
+        struct kex *kex = ssh->kex;
+        OM_uint32 maj_status, min_status;
+
+        /*
+         * Some GSSAPI implementations use the input value of ret_flags (an
+         * output variable) as a means of triggering mechanism specific
+         * features. Initializing it to zero avoids inadvertently
+         * activating this non-standard behaviour.
+         */
+
+        OM_uint32 ret_flags = 0;
+        gss_buffer_desc gssbuf, recv_tok, msg_tok;
+        gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
+        Gssctxt *ctxt = NULL;
+        struct sshbuf *shared_secret = NULL;
+        int type = 0;
+        gss_OID oid;
+        char *mechs;
+        u_char hash[SSH_DIGEST_MAX_LENGTH];
+        size_t hashlen;
+        BIGNUM *dh_client_pub = NULL;
+        const BIGNUM *pub_key, *dh_p, *dh_g;
+        int min = -1, max = -1, nbits = -1;
+        int cmin = -1, cmax = -1; /* client proposal */
+        struct sshbuf *empty = sshbuf_new();
+        int r;
+
+        /* Initialise GSSAPI */
+
+        /* If we're rekeying, privsep means that some of the private structures
+         * in the GSSAPI code are no longer available. This kludges them back
+         * into life
+         */
+        if (!ssh_gssapi_oid_table_ok())
+                if ((mechs = ssh_gssapi_server_mechanisms()))
+                        free(mechs);
+
+        debug2("%s: Identifying %s", __func__, kex->name);
+        oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
+        if (oid == GSS_C_NO_OID)
+           fatal("Unknown gssapi mechanism");
+
+        debug2("%s: Acquiring credentials", __func__);
+
+        if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
+                fatal("Unable to acquire credentials for the server");
+
+        /* 5. S generates an ephemeral key pair (do the allocations early) */
+        debug("Doing group exchange");
+        ssh_packet_read_expect(ssh, SSH2_MSG_KEXGSS_GROUPREQ);
+        /* store client proposal to provide valid signature */
+        if ((r = sshpkt_get_u32(ssh, &cmin)) != 0 ||
+            (r = sshpkt_get_u32(ssh, &nbits)) != 0 ||
+            (r = sshpkt_get_u32(ssh, &cmax)) != 0 ||
+            (r = sshpkt_get_end(ssh)) != 0)
+                fatal("sshpkt failed: %s", ssh_err(r));
+        kex->nbits = nbits;
+        kex->min = cmin;
+        kex->max = cmax;
+        min = MAX(DH_GRP_MIN, cmin);
+        max = MIN(DH_GRP_MAX, cmax);
+        nbits = MAXIMUM(DH_GRP_MIN, nbits);
+        nbits = MINIMUM(DH_GRP_MAX, nbits);
+        if (max < min || nbits < min || max < nbits)
+                fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
+                    min, nbits, max);
+        kex->dh = PRIVSEP(choose_dh(min, nbits, max));
+        if (kex->dh == NULL) {
+                sshpkt_disconnect(ssh, "Protocol error: no matching group found");
+                fatal("Protocol error: no matching group found");
         }
 
-        BN_clear_free(dh_client_pub);
+        DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
+        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_GROUP)) != 0 ||
+            (r = sshpkt_put_bignum2(ssh, dh_p)) != 0 ||
+            (r = sshpkt_put_bignum2(ssh, dh_g)) != 0 ||
+            (r = sshpkt_send(ssh)) != 0)
+                fatal("sshpkt failed: %s", ssh_err(r));
+
+        if ((r = ssh_packet_write_wait(ssh)) != 0)
+                fatal("ssh_packet_write_wait: %s", ssh_err(r));
+
+        /* Compute our exchange value in parallel with the client */
+        if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
+                goto out;
+
+        do {
+                debug("Wait SSH2_MSG_GSSAPI_INIT");
+                type = ssh_packet_read(ssh);
+                switch(type) {
+                case SSH2_MSG_KEXGSS_INIT:
+                        if (dh_client_pub != NULL)
+                                fatal("Received KEXGSS_INIT after initialising");
+                        if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
+                                &recv_tok)) != 0 ||
+                            (r = sshpkt_get_bignum2(ssh, &dh_client_pub)) != 0 ||
+                            (r = sshpkt_get_end(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
+
+                        /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
+                        break;
+                case SSH2_MSG_KEXGSS_CONTINUE:
+                        if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
+                                &recv_tok)) != 0 ||
+                            (r = sshpkt_get_end(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
+                        break;
+                default:
+                        sshpkt_disconnect(ssh,
+                            "Protocol error: didn't expect packet type %d",
+                            type);
+                }
+
+                maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
+                    &send_tok, &ret_flags));
 
-        if (ssh->kex->session_id == NULL) {
-                ssh->kex->session_id_len = hashlen;
-                ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
-                memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
+                gss_release_buffer(&min_status, &recv_tok);
+
+                if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
+                        fatal("Zero length token output when incomplete");
+
+                if (dh_client_pub == NULL)
+                        fatal("No client public key");
+
+                if (maj_status & GSS_S_CONTINUE_NEEDED) {
+                        debug("Sending GSSAPI_CONTINUE");
+                        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
+                            (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
+                            (r = sshpkt_send(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
+                        gss_release_buffer(&min_status, &send_tok);
+                }
+        } while (maj_status & GSS_S_CONTINUE_NEEDED);
+
+        if (GSS_ERROR(maj_status)) {
+                if (send_tok.length > 0) {
+                        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
+                            (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
+                            (r = sshpkt_send(ssh)) != 0)
+                                fatal("sshpkt failed: %s", ssh_err(r));
+                }
+                fatal("accept_ctx died");
+        }
+
+        if (!(ret_flags & GSS_C_MUTUAL_FLAG))
+                fatal("Mutual Authentication flag wasn't set");
+
+        if (!(ret_flags & GSS_C_INTEG_FLAG))
+                fatal("Integrity flag wasn't set");
+
+        /* calculate shared secret */
+        if ((shared_secret = sshbuf_new()) == NULL) {
+                r = SSH_ERR_ALLOC_FAIL;
+                goto out;
         }
+        if ((r = kex_dh_compute_key(kex, dh_client_pub, shared_secret)) != 0)
+                goto out;
+
+        DH_get0_key(kex->dh, &pub_key, NULL);
+        DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
+        hashlen = sizeof(hash);
+        if ((r = kexgex_hash(
+            kex->hash_alg,
+            kex->client_version,
+            kex->server_version,
+            kex->peer,
+            kex->my,
+            empty,
+            cmin, nbits, cmax,
+            dh_p, dh_g,
+            dh_client_pub,
+            pub_key,
+            sshbuf_ptr(shared_secret), sshbuf_len(shared_secret),
+            hash, &hashlen)) != 0)
+                fatal("kexgex_hash failed: %s", ssh_err(r));
 
         gssbuf.value = hash;
         gssbuf.length = hashlen;
 
-        if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
+        if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt, &gssbuf, &msg_tok))))
                 fatal("Couldn't get MIC");
 
-        packet_start(SSH2_MSG_KEXGSS_COMPLETE);
-        packet_put_bignum2(pub_key);
-        packet_put_string(msg_tok.value,msg_tok.length);
+        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_COMPLETE)) != 0 ||
+            (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 ||
+            (r = sshpkt_put_string(ssh, msg_tok.value, msg_tok.length)) != 0)
+                fatal("sshpkt failed: %s", ssh_err(r));
 
         if (send_tok.length != 0) {
-                packet_put_char(1); /* true */
-                packet_put_string(send_tok.value, send_tok.length);
+                if ((r = sshpkt_put_u8(ssh, 1)) != 0 || /* true */
+                    (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0)
+                        fatal("sshpkt failed: %s", ssh_err(r));
         } else {
-                packet_put_char(0); /* false */
+                if ((r = sshpkt_put_u8(ssh, 0)) != 0) /* false */
+                        fatal("sshpkt failed: %s", ssh_err(r));
         }
-        packet_send();
+        if ((r = sshpkt_send(ssh)) != 0)
+                fatal("sshpkt failed: %s", ssh_err(r));
 
         gss_release_buffer(&min_status, &send_tok);
         gss_release_buffer(&min_status, &msg_tok);
 
         if (gss_kex_context == NULL)
                 gss_kex_context = ctxt;
-        else 
+        else
                 ssh_gssapi_delete_ctx(&ctxt);
 
-        DH_free(dh);
-
-        kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
-        BN_clear_free(shared_secret);
-        kex_send_newkeys(ssh);
+        /* Finally derive the keys and send them */
+        if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
+                r = kex_send_newkeys(ssh);
 
         /* If this was a rekey, then save out any delegated credentials we
          * just exchanged.  */
         if (options.gss_store_rekey)
                 ssh_gssapi_rekey_creds();
-        return 0;
+out:
+        sshbuf_free(empty);
+        explicit_bzero(hash, sizeof(hash));
+        DH_free(kex->dh);
+        kex->dh = NULL;
+        BN_clear_free(dh_client_pub);
+        sshbuf_free(shared_secret);
+        return r;
 }
-#endif /* GSSAPI */
+#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */