diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2019-08-06 20:29:01 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-08-07 09:49:00 +0200 |
commit | 72ab667ff803f3ac13c245d09ac924c652bbc9ca (patch) | |
tree | b1e4fdeade445d865cfe883bc48270d569a4d8c2 | |
parent | 7b2ba2125cf50622db759dcb0b5589f47307dd7f (diff) | |
download | libssh-72ab667ff803f3ac13c245d09ac924c652bbc9ca.tar.gz libssh-72ab667ff803f3ac13c245d09ac924c652bbc9ca.tar.xz libssh-72ab667ff803f3ac13c245d09ac924c652bbc9ca.zip |
dh_key: Fix ssh_dh_debug()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r-- | src/dh_key.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/dh_key.c b/src/dh_key.c index 32c4af2e..b61fe4b1 100644 --- a/src/dh_key.c +++ b/src/dh_key.c @@ -264,24 +264,18 @@ void ssh_dh_cleanup(struct ssh_crypto_struct *crypto) } #ifdef DEBUG_CRYPTO -static void ssh_dh_debug(ssh_session session) +static void ssh_dh_debug(struct dh_ctx *dh_ctx) { - struct ssh_crypto_struct *crypto = session->next_crypto; const_bignum x, y, e, f; - ssh_dh_keypair_get_keys(crypto->dh_ctx, DH_CLIENT_KEYPAIR, &x, &e); - ssh_dh_keypair_get_keys(crypto->dh_ctx, DH_SERVER_KEYPAIR, &y, &f); - ssh_print_bignum("p", crypto->dh_ctx->modulus); - ssh_print_bignum("g", crypto->dh_ctx->generator); + + ssh_dh_keypair_get_keys(dh_ctx, DH_CLIENT_KEYPAIR, &x, &e); + ssh_dh_keypair_get_keys(dh_ctx, DH_SERVER_KEYPAIR, &y, &f); + ssh_print_bignum("p", dh_ctx->modulus); + ssh_print_bignum("g", dh_ctx->generator); ssh_print_bignum("x", x); ssh_print_bignum("y", y); ssh_print_bignum("e", e); ssh_print_bignum("f", f); - - ssh_log_hexdump("Session server cookie", - session->next_crypto->server_kex.cookie, 16); - ssh_log_hexdump("Session client cookie", - session->next_crypto->client_kex.cookie, 16); - ssh_print_bignum("k", session->next_crypto->shared_secret); } #else #define ssh_dh_debug(session) @@ -370,7 +364,7 @@ int ssh_dh_compute_shared_secret(struct dh_ctx *dh_ctx, int local, int remote, done: bignum_ctx_free(ctx); - ssh_dh_debug(session); + ssh_dh_debug(dh_ctx); if (rc != 1) { return SSH_ERROR; } |