lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-06-16 19:00:56 +03:00
Code 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
examples/authentication.c
View File

@ -116,7 +116,7 @@ int authenticate_console(ssh_session session){
return rc; return rc;
} }
method = ssh_auth_list(session); method = ssh_userauth_list(session, NULL);
while (rc != SSH_AUTH_SUCCESS) { while (rc != SSH_AUTH_SUCCESS) {
if (method & SSH_AUTH_METHOD_GSSAPI_MIC){ if (method & SSH_AUTH_METHOD_GSSAPI_MIC){
rc = ssh_userauth_gssapi(session); rc = ssh_userauth_gssapi(session);
@ -129,7 +129,7 @@ int authenticate_console(ssh_session session){
} }
// Try to authenticate with public key first // Try to authenticate with public key first
if (method & SSH_AUTH_METHOD_PUBLICKEY) { if (method & SSH_AUTH_METHOD_PUBLICKEY) {
rc = ssh_userauth_autopubkey(session, NULL); rc = ssh_userauth_publickey_auto(session, NULL, NULL);
if (rc == SSH_AUTH_ERROR) { if (rc == SSH_AUTH_ERROR) {
error(session); error(session);
return rc; return rc;

28
examples/sshnetcat.c
View File

@ -102,27 +102,27 @@ static void select_loop(ssh_session session,ssh_channel channel){
if(FD_ISSET(0,&fds)){ if(FD_ISSET(0,&fds)){
lus=read(0,buffer,sizeof(buffer)); lus=read(0,buffer,sizeof(buffer));
if(lus) if(lus)
channel_write(channel,buffer,lus); ssh_channel_write(channel,buffer,lus);
else { else {
eof=1; eof=1;
channel_send_eof(channel); ssh_channel_send_eof(channel);
} }
} }
if(channel && channel_is_closed(channel)){ if(channel && ssh_channel_is_closed(channel)){
channel_free(channel); ssh_channel_free(channel);
channel=NULL; channel=NULL;
channels[0]=NULL; channels[0]=NULL;
} }
if(outchannels[0]){ if(outchannels[0]){
while(channel && channel_is_open(channel) && channel_poll(channel,0)){ while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,0)){
lus=channel_read(channel,buffer,sizeof(buffer),0); lus = ssh_channel_read(channel,buffer,sizeof(buffer),0);
if(lus==-1){ if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n", fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session)); ssh_get_error(session));
return; return;
} }
if(lus==0){ if(lus==0){
channel_free(channel); ssh_channel_free(channel);
channel=channels[0]=NULL; channel=channels[0]=NULL;
} else { } else {
ret = write(1, buffer, lus); ret = write(1, buffer, lus);
@ -133,15 +133,15 @@ static void select_loop(ssh_session session,ssh_channel channel){
} }
} }
} }
while(channel && channel_is_open(channel) && channel_poll(channel,1)){ /* stderr */ while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,1)){ /* stderr */
lus=channel_read(channel,buffer,sizeof(buffer),1); lus = ssh_channel_read(channel, buffer, sizeof(buffer), 1);
if(lus==-1){ if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n", fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session)); ssh_get_error(session));
return; return;
} }
if(lus==0){ if(lus==0){
channel_free(channel); ssh_channel_free(channel);
channel=channels[0]=NULL; channel=channels[0]=NULL;
} else { } else {
ret = write(2, buffer, lus); ret = write(2, buffer, lus);
@ -153,8 +153,8 @@ static void select_loop(ssh_session session,ssh_channel channel){
} }
} }
} }
if(channel && channel_is_closed(channel)){ if(channel && ssh_channel_is_closed(channel)){
channel_free(channel); ssh_channel_free(channel);
channel=NULL; channel=NULL;
} }
} while (ret==EINTR || ret==SSH_EINTR); } while (ret==EINTR || ret==SSH_EINTR);
@ -165,8 +165,8 @@ static void select_loop(ssh_session session,ssh_channel channel){
static void forwarding(ssh_session session){ static void forwarding(ssh_session session){
ssh_channel channel; ssh_channel channel;
int r; int r;
channel=channel_new(session); channel = ssh_channel_new(session);
r=channel_open_forward(channel,desthost,atoi(port),"localhost",22); r = ssh_channel_open_forward(channel, desthost, atoi(port), "localhost", 22);
if(r<0) { if(r<0) {
printf("error forwarding port : %s\n",ssh_get_error(session)); printf("error forwarding port : %s\n",ssh_get_error(session));
return; return;

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); rc = buffer_add_ssh_string(session->out_buffer, answer);
string_burn(answer); ssh_string_burn(answer);
string_free(answer); ssh_string_free(answer);
if (rc < 0) { if (rc < 0) {
goto fail; 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 */ /* TODO: fix the hardcoding */
tmpstring->size = htonl(len); tmpstring->size = htonl(len);
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
bignum_bn2bin(tmpbn, len, string_data(tmpstring)); bignum_bn2bin(tmpbn, len, ssh_string_data(tmpstring));
#elif defined HAVE_LIBCRYPTO #elif defined HAVE_LIBCRYPTO
bignum_bn2bin(tmpbn, string_data(tmpstring)); bignum_bn2bin(tmpbn, ssh_string_data(tmpstring));
#endif #endif
bignum_free(tmpbn); bignum_free(tmpbn);
if (buffer_add_ssh_string(pubkey_buffer, tmpstring) < 0) { 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"); ssh_set_error(session, SSH_FATAL, "Invalid parameters");
return SSH_ERROR; 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) { if (pubkey_64 == NULL) {
return SSH_ERROR; 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); ssh_string_fill(str, crypto->session_id, crypto->digest_len);
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@ -623,7 +623,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL; return NULL;
} }
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@ -636,7 +636,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL; return NULL;
} }
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@ -649,7 +649,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL; return NULL;
} }
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@ -669,7 +669,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL; return NULL;
} }
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@ -682,7 +682,7 @@ static ssh_buffer ssh_msg_userauth_build_digest(ssh_session session,
return NULL; return NULL;
} }
rc = buffer_add_ssh_string(buffer, str); rc = buffer_add_ssh_string(buffer, str);
string_free(str); ssh_string_free(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; 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; break;
} }
attr->owner = ssh_string_to_char(owner); attr->owner = ssh_string_to_char(owner);
string_free(owner); ssh_string_free(owner);
if (attr->owner == NULL) { if (attr->owner == NULL) {
break; break;
} }
@ -1008,7 +1008,7 @@ static sftp_attributes sftp_parse_attr_4(sftp_session sftp, ssh_buffer buf,
break; break;
} }
attr->group = ssh_string_to_char(group); attr->group = ssh_string_to_char(group);
string_free(group); ssh_string_free(group);
if (attr->group == NULL) { if (attr->group == NULL) {
break; 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 ssh_socket_get_status(ssh_socket s) {
int r = 0; int r = 0;
if (buffer_get_len(s->in_buffer) > 0) { if (ssh_buffer_get_len(s->in_buffer) > 0) {
r |= SSH_READ_PENDING; 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; r |= SSH_WRITE_PENDING;
} }

4
tests/unittests/torture_buffer.c
View File

@ -102,7 +102,7 @@ static void torture_buffer_get_ssh_string(void **state) {
for(i=0; i < (int)(sizeof(values)/sizeof(values[0]));++i){ for(i=0; i < (int)(sizeof(values)/sizeof(values[0]));++i){
for(j=0; j< (int)sizeof(data);++j){ for(j=0; j< (int)sizeof(data);++j){
for(k=1;k<5;++k){ for(k=1;k<5;++k){
buffer=buffer_new(); buffer = ssh_buffer_new();
assert_non_null(buffer); assert_non_null(buffer);
for(l=0;l<k;++l){ for(l=0;l<k;++l){
@ -116,7 +116,7 @@ static void torture_buffer_get_ssh_string(void **state) {
assert_null(str); assert_null(str);
ssh_string_free(str); ssh_string_free(str);
} }
buffer_free(buffer); ssh_buffer_free(buffer);
} }
} }
} }