lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-17 14:21:05 +03:00
Code Activity

src: Rename buffer_init to ssh_buffer_init().

Browse Source
This commit is contained in:
Andreas Schneider
2014-01-19 20:43:29 +01:00
parent e745236ae5
commit 9c4144689d
17 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/buffer.h
View File

@@ -48,7 +48,7 @@ int buffer_add_u64(ssh_buffer buffer, uint64_t data);
int buffer_add_data(ssh_buffer buffer, const void *data, uint32_t len); int buffer_add_data(ssh_buffer buffer, const void *data, uint32_t len);
int buffer_prepend_data(ssh_buffer buffer, const void *data, uint32_t len); int buffer_prepend_data(ssh_buffer buffer, const void *data, uint32_t len);
int buffer_add_buffer(ssh_buffer buffer, ssh_buffer source); int buffer_add_buffer(ssh_buffer buffer, ssh_buffer source);
int buffer_reinit(ssh_buffer buffer); int ssh_buffer_reinit(ssh_buffer buffer);
/* buffer_get_rest returns a pointer to the current position into the buffer */ /* buffer_get_rest returns a pointer to the current position into the buffer */
void *buffer_get_rest(ssh_buffer buffer); void *buffer_get_rest(ssh_buffer buffer);

2
src/agent.c
View File

@@ -393,7 +393,7 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session) {
} }
if (session->agent->ident) { if (session->agent->ident) {
buffer_reinit(session->agent->ident); ssh_buffer_reinit(session->agent->ident);
} }
session->agent->ident = reply; session->agent->ident = reply;

14
src/auth.c
View File

@@ -448,7 +448,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -614,7 +614,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -788,7 +788,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -924,7 +924,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -1415,7 +1415,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -1642,7 +1642,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
@@ -1716,7 +1716,7 @@ pending:
return rc; return rc;
fail: fail:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }

3
src/buffer.c
View File

@@ -158,7 +158,8 @@ static void buffer_shift(ssh_buffer buffer){
* *
* @return 0 on success, < 0 on error. * @return 0 on success, < 0 on error.
*/ */
int buffer_reinit(struct ssh_buffer_struct *buffer) { int ssh_buffer_reinit(struct ssh_buffer_struct *buffer)
{
buffer_verify(buffer); buffer_verify(buffer);
memset(buffer->data, 0, buffer->used); memset(buffer->data, 0, buffer->used);
buffer->used = 0; buffer->used = 0;

14
src/channels.c
View File

@@ -393,7 +393,7 @@ static int grow_window(ssh_session session, ssh_channel channel, int minimumsize
return SSH_OK; return SSH_OK;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }
@@ -1171,7 +1171,7 @@ int ssh_channel_send_eof(ssh_channel channel){
return rc; return rc;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return rc; return rc;
} }
@@ -1229,7 +1229,7 @@ int ssh_channel_close(ssh_channel channel){
return rc; return rc;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return rc; return rc;
} }
@@ -1418,7 +1418,7 @@ out:
return (int)(origlen - len); return (int)(origlen - len);
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }
@@ -1673,7 +1673,7 @@ pending:
return rc; return rc;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return rc; return rc;
} }
@@ -2240,7 +2240,7 @@ pending:
return rc; return rc;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return rc; return rc;
} }
@@ -2652,7 +2652,7 @@ int channel_read_buffer(ssh_channel channel, ssh_buffer buffer, uint32_t count,
return SSH_ERROR; return SSH_ERROR;
} }
buffer_reinit(buffer); ssh_buffer_reinit(buffer);
if(count==0){ if(count==0){
do { do {
r=ssh_channel_poll(channel, is_stderr); r=ssh_channel_poll(channel, is_stderr);

20
src/client.c
View File

@@ -659,14 +659,18 @@ error:
crypto_free(session->current_crypto); crypto_free(session->current_crypto);
session->current_crypto=NULL; session->current_crypto=NULL;
} }
if(session->in_buffer) if (session->in_buffer) {
buffer_reinit(session->in_buffer); ssh_buffer_reinit(session->in_buffer);
if(session->out_buffer) }
buffer_reinit(session->out_buffer); if (session->out_buffer) {
if(session->in_hashbuf) ssh_buffer_reinit(session->out_buffer);
buffer_reinit(session->in_hashbuf); }
if(session->out_hashbuf) if (session->in_hashbuf) {
buffer_reinit(session->out_hashbuf); ssh_buffer_reinit(session->in_hashbuf);
}
if (session->out_hashbuf) {
ssh_buffer_reinit(session->out_hashbuf);
}
session->auth_methods = 0; session->auth_methods = 0;
SAFE_FREE(session->serverbanner); SAFE_FREE(session->serverbanner);
SAFE_FREE(session->clientbanner); SAFE_FREE(session->clientbanner);

2
src/curve25519.c
View File

@@ -283,7 +283,7 @@ int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet){
return rc; return rc;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }

10
src/dh.c
View File

@@ -808,20 +808,20 @@ int hashbufout_add_cookie(ssh_session session) {
} }
if (buffer_add_u8(session->out_hashbuf, 20) < 0) { if (buffer_add_u8(session->out_hashbuf, 20) < 0) {
buffer_reinit(session->out_hashbuf); ssh_buffer_reinit(session->out_hashbuf);
return -1; return -1;
} }
if (session->server) { if (session->server) {
if (buffer_add_data(session->out_hashbuf, if (buffer_add_data(session->out_hashbuf,
session->next_crypto->server_kex.cookie, 16) < 0) { session->next_crypto->server_kex.cookie, 16) < 0) {
buffer_reinit(session->out_hashbuf); ssh_buffer_reinit(session->out_hashbuf);
return -1; return -1;
} }
} else { } else {
if (buffer_add_data(session->out_hashbuf, if (buffer_add_data(session->out_hashbuf,
session->next_crypto->client_kex.cookie, 16) < 0) { session->next_crypto->client_kex.cookie, 16) < 0) {
buffer_reinit(session->out_hashbuf); ssh_buffer_reinit(session->out_hashbuf);
return -1; return -1;
} }
} }
@@ -836,11 +836,11 @@ int hashbufin_add_cookie(ssh_session session, unsigned char *cookie) {
} }
if (buffer_add_u8(session->in_hashbuf, 20) < 0) { if (buffer_add_u8(session->in_hashbuf, 20) < 0) {
buffer_reinit(session->in_hashbuf); ssh_buffer_reinit(session->in_hashbuf);
return -1; return -1;
} }
if (buffer_add_data(session->in_hashbuf,cookie, 16) < 0) { if (buffer_add_data(session->in_hashbuf,cookie, 16) < 0) {
buffer_reinit(session->in_hashbuf); ssh_buffer_reinit(session->in_hashbuf);
return -1; return -1;
} }

2
src/gssapi.c
View File

@@ -615,7 +615,7 @@ static int ssh_gssapi_send_auth_mic(ssh_session session, ssh_string *oid_set, in
session->auth_state = SSH_AUTH_STATE_GSSAPI_REQUEST_SENT; session->auth_state = SSH_AUTH_STATE_GSSAPI_REQUEST_SENT;
return packet_send(session); return packet_send(session);
fail: fail:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }

4
src/gzip.c
View File

@@ -108,7 +108,7 @@ int compress_buffer(ssh_session session, ssh_buffer buf) {
return -1; return -1;
} }
if (buffer_reinit(buf) < 0) { if (ssh_buffer_reinit(buf) < 0) {
ssh_buffer_free(dest); ssh_buffer_free(dest);
return -1; return -1;
} }
@@ -204,7 +204,7 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){
return -1; return -1;
} }
if (buffer_reinit(buf) < 0) { if (ssh_buffer_reinit(buf) < 0) {
ssh_buffer_free(dest); ssh_buffer_free(dest);
return -1; return -1;
} }

4
src/kex.c
View File

@@ -477,8 +477,8 @@ int ssh_send_kex(ssh_session session, int server_kex) {
return 0; return 0;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
buffer_reinit(session->out_hashbuf); ssh_buffer_reinit(session->out_hashbuf);
ssh_string_free(str); ssh_string_free(str);
return -1; return -1;

4
src/packet.c
View File

@@ -177,7 +177,7 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
memset(&session->in_packet, 0, sizeof(PACKET)); memset(&session->in_packet, 0, sizeof(PACKET));
if (session->in_buffer) { if (session->in_buffer) {
rc = buffer_reinit(session->in_buffer); rc = ssh_buffer_reinit(session->in_buffer);
if (rc < 0) { if (rc < 0) {
goto error; goto error;
} }
@@ -558,7 +558,7 @@ static int packet_send2(ssh_session session) {
SSH_LOG(SSH_LOG_PACKET, SSH_LOG(SSH_LOG_PACKET,
"packet: wrote [len=%d,padding=%hhd,comp=%d,payload=%d]", "packet: wrote [len=%d,padding=%hhd,comp=%d,payload=%d]",
ntohl(finallen), padding, compsize, payloadsize); ntohl(finallen), padding, compsize, payloadsize);
if (buffer_reinit(session->out_buffer) < 0) { if (ssh_buffer_reinit(session->out_buffer) < 0) {
rc = SSH_ERROR; rc = SSH_ERROR;
} }
error: error:

4
src/packet1.c
View File

@@ -114,7 +114,7 @@ int ssh_packet_socket_callback1(const void *data, size_t receivedlen, void *user
memset(&session->in_packet, 0, sizeof(PACKET)); memset(&session->in_packet, 0, sizeof(PACKET));
if (session->in_buffer) { if (session->in_buffer) {
if (buffer_reinit(session->in_buffer) < 0) { if (ssh_buffer_reinit(session->in_buffer) < 0) {
goto error; goto error;
} }
} else { } else {
@@ -315,7 +315,7 @@ int packet_send1(ssh_session session) {
session->send_seq++; session->send_seq++;
if (buffer_reinit(session->out_buffer) < 0) { if (ssh_buffer_reinit(session->out_buffer) < 0) {
rc = SSH_ERROR; rc = SSH_ERROR;
} }
error: error:

2
src/pki_crypto.c
View File

@@ -935,7 +935,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
break; break;
case SSH_KEYTYPE_ECDSA: case SSH_KEYTYPE_ECDSA:
#ifdef HAVE_OPENSSL_ECC #ifdef HAVE_OPENSSL_ECC
rc = buffer_reinit(buffer); rc = ssh_buffer_reinit(buffer);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;

6
src/server.c
View File

@@ -290,7 +290,7 @@ static int dh_handshake_server(ssh_session session) {
buffer_add_ssh_string(session->out_buffer, f) < 0 || buffer_add_ssh_string(session->out_buffer, f) < 0 ||
buffer_add_ssh_string(session->out_buffer, sig_blob) < 0) { buffer_add_ssh_string(session->out_buffer, sig_blob) < 0) {
ssh_set_error(session, SSH_FATAL, "Not enough space"); ssh_set_error(session, SSH_FATAL, "Not enough space");
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
ssh_string_free(f); ssh_string_free(f);
ssh_string_free(sig_blob); ssh_string_free(sig_blob);
return -1; return -1;
@@ -302,7 +302,7 @@ static int dh_handshake_server(ssh_session session) {
} }
if (buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS) < 0) { if (buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS) < 0) {
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return -1; return -1;
} }
@@ -1258,7 +1258,7 @@ int ssh_send_keepalive(ssh_session session)
err: err:
ssh_set_error_oom(session); ssh_set_error_oom(session);
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }

4
src/session.c
View File

@@ -735,7 +735,7 @@ int ssh_send_ignore (ssh_session session, const char *data) {
return SSH_OK; return SSH_OK;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }
@@ -786,7 +786,7 @@ int ssh_send_debug (ssh_session session, const char *message, int always_display
return SSH_OK; return SSH_OK;
error: error:
buffer_reinit(session->out_buffer); ssh_buffer_reinit(session->out_buffer);
return SSH_ERROR; return SSH_ERROR;
} }

4
src/socket.c
View File

@@ -182,8 +182,8 @@ void ssh_socket_reset(ssh_socket s){
s->fd_out= SSH_INVALID_SOCKET; s->fd_out= SSH_INVALID_SOCKET;
s->last_errno = -1; s->last_errno = -1;
s->fd_is_socket = 1; s->fd_is_socket = 1;
buffer_reinit(s->in_buffer); ssh_buffer_reinit(s->in_buffer);
buffer_reinit(s->out_buffer); ssh_buffer_reinit(s->out_buffer);
s->read_wontblock = 0; s->read_wontblock = 0;
s->write_wontblock = 0; s->write_wontblock = 0;
s->data_except = 0; s->data_except = 0;