From 873e02fc6a0de3792a2a0a713ef21d4b67c308d2 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Fri, 1 Oct 2010 23:41:04 +0200
Subject: First step getting rid of ssh_buffer_get_begin

---
 src/gzip.c   | 6 +++---
 src/packet.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/gzip.c b/src/gzip.c
index 1e892dc..08497ca 100644
--- a/src/gzip.c
+++ b/src/gzip.c
@@ -185,8 +185,8 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t
       ssh_buffer_free(dest);
       return NULL;
     }
-    if (ssh_buffer_get_len(dest) > maxlen){
-      /* Size of packet exceded, avoid a denial of service attack */
+    if (buffer_get_rest_len(dest) > maxlen){
+      /* Size of packet exceeded, avoid a denial of service attack */
       ssh_buffer_free(dest);
       return NULL;
     }
@@ -209,7 +209,7 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){
     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);
     return -1;
   }
diff --git a/src/packet.c b/src/packet.c
index 65f9724..6acb0f3 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -206,8 +206,8 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
          * have been decrypted)
          */
         if (packet_decrypt(session,
-              ((uint8_t*)ssh_buffer_get_begin(session->in_buffer) + blocksize),
-              ssh_buffer_get_len(session->in_buffer) - blocksize) < 0) {
+              ((uint8_t*)buffer_get_rest(session->in_buffer) + blocksize),
+              buffer_get_rest_len(session->in_buffer) - blocksize) < 0) {
           ssh_set_error(session, SSH_FATAL, "Decrypt error");
           goto error;
         }
-- 
cgit