aboutsummaryrefslogtreecommitdiff
path: root/libssh/kex.c
diff options
context:
space:
mode:
Diffstat (limited to 'libssh/kex.c')
-rw-r--r--libssh/kex.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/libssh/kex.c b/libssh/kex.c
index 9d3b170..a137a59 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -282,11 +282,11 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit){
goto error;
}
- strings[i] = string_to_char(str);
+ strings[i] = ssh_string_to_char(str);
if (strings[i] == NULL) {
goto error;
}
- string_free(str);
+ ssh_string_free(str);
str = NULL;
}
@@ -318,7 +318,7 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit){
ssh_connection_callback(session);
return SSH_PACKET_USED;
error:
- string_free(str);
+ ssh_string_free(str);
for (i = 0; i < 10; i++) {
SAFE_FREE(strings[i]);
}
@@ -407,7 +407,7 @@ int ssh_send_kex(ssh_session session, int server_kex) {
ssh_list_kex(session, kex);
for (i = 0; i < 10; i++) {
- str = string_from_char(kex->methods[i]);
+ str = ssh_string_from_char(kex->methods[i]);
if (str == NULL) {
goto error;
}
@@ -418,7 +418,7 @@ int ssh_send_kex(ssh_session session, int server_kex) {
if (buffer_add_ssh_string(session->out_buffer, str) < 0) {
goto error;
}
- string_free(str);
+ ssh_string_free(str);
}
if (buffer_add_u8(session->out_buffer, 0) < 0) {
@@ -438,7 +438,7 @@ int ssh_send_kex(ssh_session session, int server_kex) {
error:
buffer_reinit(session->out_buffer);
buffer_reinit(session->out_hashbuf);
- string_free(str);
+ ssh_string_free(str);
leave_function();
return -1;
@@ -466,8 +466,8 @@ static ssh_string make_rsa1_string(ssh_string e, ssh_string n){
ssh_string rsa = NULL;
ssh_string ret = NULL;
- buffer = buffer_new();
- rsa = string_from_char("ssh-rsa1");
+ buffer = ssh_buffer_new();
+ rsa = ssh_string_from_char("ssh-rsa1");
if (buffer_add_ssh_string(buffer, rsa) < 0) {
goto error;
@@ -479,15 +479,15 @@ static ssh_string make_rsa1_string(ssh_string e, ssh_string n){
goto error;
}
- ret = string_new(buffer_get_len(buffer));
+ ret = ssh_string_new(ssh_buffer_get_len(buffer));
if (ret == NULL) {
goto error;
}
- string_fill(ret, buffer_get(buffer), buffer_get_len(buffer));
+ ssh_string_fill(ret, ssh_buffer_get_begin(buffer), ssh_buffer_get_len(buffer));
error:
- buffer_free(buffer);
- string_free(rsa);
+ ssh_buffer_free(buffer);
+ ssh_string_free(rsa);
return ret;
}
@@ -502,11 +502,11 @@ static int build_session_id1(ssh_session session, ssh_string servern,
}
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("host modulus",string_data(hostn),string_len(hostn));
- ssh_print_hexa("server modulus",string_data(servern),string_len(servern));
+ ssh_print_hexa("host modulus",ssh_string_data(hostn),ssh_string_len(hostn));
+ ssh_print_hexa("server modulus",ssh_string_data(servern),ssh_string_len(servern));
#endif
- md5_update(md5,string_data(hostn),string_len(hostn));
- md5_update(md5,string_data(servern),string_len(servern));
+ md5_update(md5,ssh_string_data(hostn),ssh_string_len(hostn));
+ md5_update(md5,ssh_string_data(servern),ssh_string_len(servern));
md5_update(md5,session->server_kex.cookie,8);
md5_final(session->next_crypto->session_id,md5);
#ifdef DEBUG_CRYPTO
@@ -566,11 +566,11 @@ static ssh_string encrypt_session_key(ssh_session session, ssh_public_key srvkey
for (i = 0; i < 16; i++) {
buffer[i] ^= session->next_crypto->session_id[i];
}
- data1 = string_new(32);
+ data1 = ssh_string_new(32);
if (data1 == NULL) {
return NULL;
}
- string_fill(data1, buffer, 32);
+ ssh_string_fill(data1, buffer, 32);
if (ABS(hlen - slen) < 128){
ssh_log(session, SSH_LOG_FUNCTIONS,
"Difference between server modulus and host modulus is only %d. "
@@ -580,25 +580,25 @@ static ssh_string encrypt_session_key(ssh_session session, ssh_public_key srvkey
if (modulus_smaller(srvkey, hostkey)) {
data2 = ssh_encrypt_rsa1(session, data1, srvkey);
- string_free(data1);
+ ssh_string_free(data1);
data1 = NULL;
if (data2 == NULL) {
return NULL;
}
data1 = ssh_encrypt_rsa1(session, data2, hostkey);
- string_free(data2);
+ ssh_string_free(data2);
if (data1 == NULL) {
return NULL;
}
} else {
data2 = ssh_encrypt_rsa1(session, data1, hostkey);
- string_free(data1);
+ ssh_string_free(data1);
data1 = NULL;
if (data2 == NULL) {
return NULL;
}
data1 = ssh_encrypt_rsa1(session, data2, srvkey);
- string_free(data2);
+ ssh_string_free(data2);
if (data1 == NULL) {
return NULL;
}
@@ -718,7 +718,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
goto error;
}
- session->next_crypto->server_pubkey = string_copy(hostkey);
+ session->next_crypto->server_pubkey = ssh_string_copy(hostkey);
if (session->next_crypto->server_pubkey == NULL) {
goto error;
}
@@ -747,16 +747,16 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
goto error;
}
- bits = string_len(enc_session) * 8 - 7;
+ bits = ssh_string_len(enc_session) * 8 - 7;
ssh_log(session, SSH_LOG_PROTOCOL, "%d bits, %zu bytes encrypted session",
- bits, string_len(enc_session));
+ bits, ssh_string_len(enc_session));
bits = htons(bits);
/* the encrypted mpint */
if (buffer_add_data(session->out_buffer, &bits, sizeof(uint16_t)) < 0) {
goto error;
}
- if (buffer_add_data(session->out_buffer, string_data(enc_session),
- string_len(enc_session)) < 0) {
+ if (buffer_add_data(session->out_buffer, ssh_string_data(enc_session),
+ ssh_string_len(enc_session)) < 0) {
goto error;
}
/* the protocol flags */
@@ -780,13 +780,13 @@ error:
session->session_state=SSH_SESSION_STATE_ERROR;
end:
- string_free(host_mod);
- string_free(host_exp);
- string_free(server_mod);
- string_free(server_exp);
- string_free(serverkey);
- string_free(hostkey);
- string_free(enc_session);
+ ssh_string_free(host_mod);
+ ssh_string_free(host_exp);
+ ssh_string_free(server_mod);
+ ssh_string_free(server_exp);
+ ssh_string_free(serverkey);
+ ssh_string_free(hostkey);
+ ssh_string_free(enc_session);
publickey_free(srv);
publickey_free(host);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 02:32:59 +0000