aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-04-14 18:24:23 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-04-14 18:24:23 +0200
commit6195b133bf88d3dd2312530af2975ede8e12299a (patch)
tree035dcd7d2596ed83c425ba26d86bf26c601a2439
parent6e65abbe636f52ba76c2ed6763bb40f9f9bedf15 (diff)
downloadlibssh-6195b133bf88d3dd2312530af2975ede8e12299a.tar.gz
libssh-6195b133bf88d3dd2312530af2975ede8e12299a.tar.xz
libssh-6195b133bf88d3dd2312530af2975ede8e12299a.zip
Fix missing string_data() in crypto debug code
-rw-r--r--libssh/kex.c4
-rw-r--r--libssh/keys.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/libssh/kex.c b/libssh/kex.c
index 5a5113a3..58e1d6a0 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -487,8 +487,8 @@ static int build_session_id1(ssh_session session, ssh_string servern,
}
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("host modulus",hostn->string,string_len(hostn));
- ssh_print_hexa("server modulus",servern->string,string_len(servern));
+ ssh_print_hexa("host modulus",string_data(hostn),string_len(hostn));
+ ssh_print_hexa("server modulus",string_data(servern),string_len(servern));
#endif
md5_update(md5,string_data(hostn),string_len(hostn));
md5_update(md5,string_data(servern),string_len(servern));
diff --git a/libssh/keys.c b/libssh/keys.c
index d6bb8de1..45b79390 100644
--- a/libssh/keys.c
+++ b/libssh/keys.c
@@ -130,9 +130,9 @@ ssh_public_key publickey_make_dss(ssh_session session, ssh_buffer buffer) {
#endif /* HAVE_LIBCRYPTO */
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("p", p->string, string_len(p));
- ssh_print_hexa("q", q->string, string_len(q));
- ssh_print_hexa("g", g->string, string_len(g));
+ ssh_print_hexa("p", string_data(p), string_len(p));
+ ssh_print_hexa("q", string_data(q), string_len(q));
+ ssh_print_hexa("g", string_data(g), string_len(g));
#endif
string_burn(p);
@@ -206,8 +206,8 @@ ssh_public_key publickey_make_rsa(ssh_session session, ssh_buffer buffer,
#endif
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("e", e->string, string_len(e));
- ssh_print_hexa("n", n->string, string_len(n));
+ ssh_print_hexa("e", string_data(e), string_len(e));
+ ssh_print_hexa("n", string_data(n), string_len(n));
#endif
string_burn(e);
@@ -974,8 +974,8 @@ SIGNATURE *signature_from_string(ssh_session session, ssh_string signature,
#endif
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("r", rs->string, 20);
- ssh_print_hexa("s", rs->string + 20, 20);
+ ssh_print_hexa("r", string_data(rs), 20);
+ ssh_print_hexa("s", (const unsigned char *)string_data(rs) + 20, 20);
#endif
string_free(rs);
@@ -1024,7 +1024,7 @@ SIGNATURE *signature_from_string(ssh_session session, ssh_string signature,
#ifdef DEBUG_CRYPTO
ssh_log(session, SSH_LOG_FUNCTIONS, "len e: %d", len);
- ssh_print_hexa("RSA signature", e->string, len);
+ ssh_print_hexa("RSA signature", string_data(e), len);
#endif
#ifdef HAVE_LIBGCRYPT