shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-07 02:39:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

src: Do not use deprecated functions.

Browse Source
This commit is contained in:
Andreas Schneider
2014-01-16 15:27:46 +01:00
parent a7157b7907
commit 2fe59071b2
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth.c
View File

@@ -1690,8 +1690,8 @@ static int ssh_userauth_kbdint_send(ssh_session session)
}
rc = buffer_add_ssh_string(session->out_buffer, answer);
string_burn(answer);
string_free(answer);
ssh_string_burn(answer);
ssh_string_free(answer);
if (rc < 0) {
goto fail;
}

4
src/known_hosts.c
View File

@@ -239,9 +239,9 @@ static int check_public_key(ssh_session session, char **tokens) {
/* TODO: fix the hardcoding */
tmpstring->size = htonl(len);
#ifdef HAVE_LIBGCRYPT
bignum_bn2bin(tmpbn, len, string_data(tmpstring));
bignum_bn2bin(tmpbn, len, ssh_string_data(tmpstring));
#elif defined HAVE_LIBCRYPTO
bignum_bn2bin(tmpbn, string_data(tmpstring));
bignum_bn2bin(tmpbn, ssh_string_data(tmpstring));
#endif
bignum_free(tmpbn);
if (buffer_add_ssh_string(pubkey_buffer, tmpstring) < 0) {

2
src/legacy.c
View File

@@ -580,7 +580,7 @@ int ssh_publickey_to_file(ssh_session session,
ssh_set_error(session, SSH_FATAL, "Invalid parameters");
return SSH_ERROR;
}
pubkey_64 = bin_to_base64(string_data(pubkey), ssh_string_len(pubkey));
pubkey_64 = bin_to_base64(ssh_string_data(pubkey), ssh_string_len(pubkey));
if (pubkey_64 == NULL) {
return SSH_ERROR;
}

12
src/messages.c
View File

@@ -603,7 +603,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
ssh_string_fill(str, crypto->session_id, crypto->digest_len);
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;
@@ -623,7 +623,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL;
}
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;
@@ -636,7 +636,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL;
}
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;
@@ -649,7 +649,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL;
}
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;
@@ -669,7 +669,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL;
}
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;
@@ -682,7 +682,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL;
}
rc = buffer_add_ssh_string(buffer, str);
string_free(str);
ssh_string_free(str);
if (rc < 0) {
ssh_buffer_free(buffer);
return NULL;

4
src/sftp.c
View File

@@ -998,7 +998,7 @@ static sftp_attributes sftp_parse_attr_4(sftp_session sftp, ssh_buffer buf,
break;
}
attr->owner = ssh_string_to_char(owner);
string_free(owner);
ssh_string_free(owner);
if (attr->owner == NULL) {
break;
}
@@ -1008,7 +1008,7 @@ static sftp_attributes sftp_parse_attr_4(sftp_session sftp, ssh_buffer buf,
break;
}
attr->group = ssh_string_to_char(group);
string_free(group);
ssh_string_free(group);
if (attr->group == NULL) {
break;
}

4
src/socket.c
View File

@@ -707,11 +707,11 @@ int ssh_socket_buffered_write_bytes(ssh_socket s){
int ssh_socket_get_status(ssh_socket s) {
int r = 0;
if (buffer_get_len(s->in_buffer) > 0) {
if (ssh_buffer_get_len(s->in_buffer) > 0) {
r |= SSH_READ_PENDING;
}
if (buffer_get_len(s->out_buffer) > 0) {
if (ssh_buffer_get_len(s->out_buffer) > 0) {
r |= SSH_WRITE_PENDING;
}