mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-08-08 19:02:06 +03:00
First step getting rid of ssh_buffer_get_begin
This commit is contained in:
@@ -185,8 +185,8 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t
|
|||||||
ssh_buffer_free(dest);
|
ssh_buffer_free(dest);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (ssh_buffer_get_len(dest) > maxlen){
|
if (buffer_get_rest_len(dest) > maxlen){
|
||||||
/* Size of packet exceded, avoid a denial of service attack */
|
/* Size of packet exceeded, avoid a denial of service attack */
|
||||||
ssh_buffer_free(dest);
|
ssh_buffer_free(dest);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -209,7 +209,7 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer_add_data(buf, ssh_buffer_get_begin(dest), ssh_buffer_get_len(dest)) < 0) {
|
if (buffer_add_data(buf, buffer_get_rest(dest), buffer_get_rest_len(dest)) < 0) {
|
||||||
ssh_buffer_free(dest);
|
ssh_buffer_free(dest);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@@ -206,8 +206,8 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
|
|||||||
* have been decrypted)
|
* have been decrypted)
|
||||||
*/
|
*/
|
||||||
if (packet_decrypt(session,
|
if (packet_decrypt(session,
|
||||||
((uint8_t*)ssh_buffer_get_begin(session->in_buffer) + blocksize),
|
((uint8_t*)buffer_get_rest(session->in_buffer) + blocksize),
|
||||||
ssh_buffer_get_len(session->in_buffer) - blocksize) < 0) {
|
buffer_get_rest_len(session->in_buffer) - blocksize) < 0) {
|
||||||
ssh_set_error(session, SSH_FATAL, "Decrypt error");
|
ssh_set_error(session, SSH_FATAL, "Decrypt error");
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user