diff options
-rw-r--r-- | examples/authentication.c | 8 | ||||
-rw-r--r-- | examples/sshnetcat.c | 28 | ||||
-rw-r--r-- | src/auth.c | 4 | ||||
-rw-r--r-- | src/known_hosts.c | 4 | ||||
-rw-r--r-- | src/legacy.c | 2 | ||||
-rw-r--r-- | src/messages.c | 12 | ||||
-rw-r--r-- | src/sftp.c | 4 | ||||
-rw-r--r-- | src/socket.c | 4 | ||||
-rw-r--r-- | tests/unittests/torture_buffer.c | 4 |
9 files changed, 35 insertions, 35 deletions
diff --git a/examples/authentication.c b/examples/authentication.c index ab5e64d6..b9f70f5b 100644 --- a/examples/authentication.c +++ b/examples/authentication.c @@ -116,7 +116,7 @@ int authenticate_console(ssh_session session){ return rc; } - method = ssh_auth_list(session); + method = ssh_userauth_list(session, NULL); while (rc != SSH_AUTH_SUCCESS) { if (method & SSH_AUTH_METHOD_GSSAPI_MIC){ rc = ssh_userauth_gssapi(session); @@ -129,10 +129,10 @@ int authenticate_console(ssh_session session){ } // Try to authenticate with public key first 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) { - error(session); - return rc; + error(session); + return rc; } else if (rc == SSH_AUTH_SUCCESS) { break; } diff --git a/examples/sshnetcat.c b/examples/sshnetcat.c index 67bb1ad6..4ed408da 100644 --- a/examples/sshnetcat.c +++ b/examples/sshnetcat.c @@ -102,27 +102,27 @@ static void select_loop(ssh_session session,ssh_channel channel){ if(FD_ISSET(0,&fds)){ lus=read(0,buffer,sizeof(buffer)); if(lus) - channel_write(channel,buffer,lus); + ssh_channel_write(channel,buffer,lus); else { eof=1; - channel_send_eof(channel); + ssh_channel_send_eof(channel); } } - if(channel && channel_is_closed(channel)){ - channel_free(channel); + if(channel && ssh_channel_is_closed(channel)){ + ssh_channel_free(channel); channel=NULL; channels[0]=NULL; } if(outchannels[0]){ - while(channel && channel_is_open(channel) && channel_poll(channel,0)){ - lus=channel_read(channel,buffer,sizeof(buffer),0); + while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,0)){ + lus = ssh_channel_read(channel,buffer,sizeof(buffer),0); if(lus==-1){ fprintf(stderr, "Error reading channel: %s\n", ssh_get_error(session)); return; } if(lus==0){ - channel_free(channel); + ssh_channel_free(channel); channel=channels[0]=NULL; } else { 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 */ - lus=channel_read(channel,buffer,sizeof(buffer),1); + while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,1)){ /* stderr */ + lus = ssh_channel_read(channel, buffer, sizeof(buffer), 1); if(lus==-1){ fprintf(stderr, "Error reading channel: %s\n", ssh_get_error(session)); return; } if(lus==0){ - channel_free(channel); + ssh_channel_free(channel); channel=channels[0]=NULL; } else { 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)){ - channel_free(channel); + if(channel && ssh_channel_is_closed(channel)){ + ssh_channel_free(channel); channel=NULL; } } 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){ ssh_channel channel; int r; - channel=channel_new(session); - r=channel_open_forward(channel,desthost,atoi(port),"localhost",22); + channel = ssh_channel_new(session); + r = ssh_channel_open_forward(channel, desthost, atoi(port), "localhost", 22); if(r<0) { printf("error forwarding port : %s\n",ssh_get_error(session)); return; @@ -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; } diff --git a/src/known_hosts.c b/src/known_hosts.c index 631ead9d..ded36a90 100644 --- a/src/known_hosts.c +++ b/src/known_hosts.c @@ -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) { diff --git a/src/legacy.c b/src/legacy.c index c98f3e0c..15f287a6 100644 --- a/src/legacy.c +++ b/src/legacy.c @@ -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; } diff --git a/src/messages.c b/src/messages.c index 77bca2fa..45d67bc6 100644 --- a/src/messages.c +++ b/src/messages.c @@ -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; @@ -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; } diff --git a/src/socket.c b/src/socket.c index 1a0bdea6..856f6d04 100644 --- a/src/socket.c +++ b/src/socket.c @@ -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; } diff --git a/tests/unittests/torture_buffer.c b/tests/unittests/torture_buffer.c index dee6e7d4..d813a132 100644 --- a/tests/unittests/torture_buffer.c +++ b/tests/unittests/torture_buffer.c @@ -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(j=0; j< (int)sizeof(data);++j){ for(k=1;k<5;++k){ - buffer=buffer_new(); + buffer = ssh_buffer_new(); assert_non_null(buffer); for(l=0;l<k;++l){ @@ -116,7 +116,7 @@ static void torture_buffer_get_ssh_string(void **state) { assert_null(str); ssh_string_free(str); } - buffer_free(buffer); + ssh_buffer_free(buffer); } } } |