lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-21 14:00:51 +03:00
Code Activity

misc: remove 'offset' from string_buf

Browse Source 
It isn't necessary.

Closes #343
This commit is contained in:
Daniel Stenberg
2019-03-24 23:19:22 +01:00
parent 38818082c1
commit 38bf7ce9ec
5 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hostkey.c
View File

@@ -79,7 +79,6 @@ hostkey_method_ssh_rsa_init(LIBSSH2_SESSION * session,
return -1; return -1;
} }
buf.offset = 0;
buf.data = (unsigned char *)hostkey_data; buf.data = (unsigned char *)hostkey_data;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = hostkey_data_len; buf.len = hostkey_data_len;
@@ -300,7 +299,6 @@ hostkey_method_ssh_dss_init(LIBSSH2_SESSION * session,
return -1; return -1;
} }
buf.offset = 0;
buf.data = (unsigned char *)hostkey_data; buf.data = (unsigned char *)hostkey_data;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = hostkey_data_len; buf.len = hostkey_data_len;
@@ -529,7 +527,6 @@ hostkey_method_ssh_ecdsa_init(LIBSSH2_SESSION * session,
return -1; return -1;
} }
buf.offset = 0;
buf.data = (unsigned char *)hostkey_data; buf.data = (unsigned char *)hostkey_data;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = hostkey_data_len; buf.len = hostkey_data_len;
@@ -667,7 +664,6 @@ hostkey_method_ssh_ecdsa_sig_verify(LIBSSH2_SESSION * session,
/* keyname_len(4) + keyname(19){"ecdsa-sha2-nistp256"} + /* keyname_len(4) + keyname(19){"ecdsa-sha2-nistp256"} +
signature_len(4) */ signature_len(4) */
buf.offset = 0;
buf.data = (unsigned char *)sig; buf.data = (unsigned char *)sig;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = sig_len; buf.len = sig_len;

3
src/kex.c
View File

@@ -1715,7 +1715,6 @@ kex_method_diffie_hellman_group_exchange_sha1_key_exchange
goto dh_gex_clean_exit; goto dh_gex_clean_exit;
} }
buf.offset = 0;
buf.data = key_state->data; buf.data = key_state->data;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = key_state->data_len; buf.len = key_state->data_len;
@@ -1843,7 +1842,6 @@ kex_method_diffie_hellman_group_exchange_sha256_key_exchange
goto dh_gex_clean_exit; goto dh_gex_clean_exit;
} }
buf.offset = 0;
buf.data = key_state->data; buf.data = key_state->data;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = key_state->data_len; buf.len = key_state->data_len;
@@ -2686,7 +2684,6 @@ curve25519_sha256(LIBSSH2_SESSION *session, unsigned char *data,
goto clean_exit; goto clean_exit;
} }
buf.offset = 0;
buf.data = data; buf.data = data;
buf.len = data_len; buf.len = data_len;
buf.dataptr = buf.data; buf.dataptr = buf.data;

4
src/misc.c
View File

@@ -742,7 +742,6 @@ int _libssh2_get_u32(struct string_buf *buf, uint32_t *out)
*out = _libssh2_ntohu32(buf->dataptr); *out = _libssh2_ntohu32(buf->dataptr);
buf->dataptr += 4; buf->dataptr += 4;
buf->offset += 4;
return 0; return 0;
} }
@@ -754,7 +753,6 @@ int _libssh2_get_u64(struct string_buf *buf, libssh2_uint64_t *out)
*out = _libssh2_ntohu64(buf->dataptr); *out = _libssh2_ntohu64(buf->dataptr);
buf->dataptr += 8; buf->dataptr += 8;
buf->offset += 8;
return 0; return 0;
} }
@@ -779,7 +777,6 @@ int _libssh2_get_c_string(struct string_buf *buf, unsigned char **outbuf)
} }
*outbuf = buf->dataptr; *outbuf = buf->dataptr;
buf->dataptr += data_len; buf->dataptr += data_len;
buf->offset += data_len;
return data_len; return data_len;
} }
@@ -808,7 +805,6 @@ int _libssh2_get_bignum_bytes(struct string_buf *buf, unsigned char **outbuf)
*outbuf = bnptr; *outbuf = bnptr;
buf->dataptr += data_len; buf->dataptr += data_len;
buf->offset += data_len;
return bn_len; return bn_len;
} }

3
src/misc.h
View File

@@ -1,6 +1,6 @@
#ifndef __LIBSSH2_MISC_H #ifndef __LIBSSH2_MISC_H
#define __LIBSSH2_MISC_H #define __LIBSSH2_MISC_H
/* Copyright (c) 2009-2014 by Daniel Stenberg /* Copyright (c) 2009-2019 by Daniel Stenberg
* *
* All rights reserved. * All rights reserved.
* *
@@ -53,7 +53,6 @@ struct string_buf {
unsigned char *data; unsigned char *data;
unsigned char *dataptr; unsigned char *dataptr;
size_t len; size_t len;
size_t offset;
}; };
int _libssh2_error_flags(LIBSSH2_SESSION* session, int errcode, int _libssh2_error_flags(LIBSSH2_SESSION* session, int errcode,

6
src/sftp.c
View File

@@ -679,7 +679,6 @@ sftp_bin2attr(LIBSSH2_SFTP_ATTRIBUTES *attrs, const unsigned char *p,
buf.data = (unsigned char *)p; buf.data = (unsigned char *)p;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = data_len; buf.len = data_len;
buf.offset = 0;
if(_libssh2_get_u32(&buf, &flags) != 0) { if(_libssh2_get_u32(&buf, &flags) != 0) {
return LIBSSH2_ERROR_BUFFER_TOO_SMALL; return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
@@ -766,6 +765,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
ssize_t rc; ssize_t rc;
LIBSSH2_SFTP *sftp_handle; LIBSSH2_SFTP *sftp_handle;
struct string_buf buf; struct string_buf buf;
unsigned char *endp;
if(session->sftpInit_state == libssh2_NB_state_idle) { if(session->sftpInit_state == libssh2_NB_state_idle) {
_libssh2_debug(session, LIBSSH2_TRACE_SFTP, _libssh2_debug(session, LIBSSH2_TRACE_SFTP,
@@ -916,7 +916,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
buf.data = data; buf.data = data;
buf.dataptr = buf.data + 1; buf.dataptr = buf.data + 1;
buf.len = data_len; buf.len = data_len;
buf.offset = 1; endp = &buf.data[data_len];
if(_libssh2_get_u32(&buf, &(sftp_handle->version)) != 0) { if(_libssh2_get_u32(&buf, &(sftp_handle->version)) != 0) {
LIBSSH2_FREE(session, data); LIBSSH2_FREE(session, data);
@@ -933,7 +933,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
_libssh2_debug(session, LIBSSH2_TRACE_SFTP, _libssh2_debug(session, LIBSSH2_TRACE_SFTP,
"Enabling SFTP version %lu compatibility", "Enabling SFTP version %lu compatibility",
sftp_handle->version); sftp_handle->version);
while(buf.offset < buf.len) { while(buf.dataptr < endp) {
unsigned char *extname, *extdata; unsigned char *extname, *extdata;
if(_libssh2_get_c_string(&buf, &extname) < 0) { if(_libssh2_get_c_string(&buf, &extname) < 0) {