- dtucker@cvs.openbsd.org 2009/06/21 09:04:03

     [roaming.h roaming_common.c roaming_dummy.c]
     Add  tags for the benefit of the sync scripts
     Also: pull in the changes for 1.1->1.2 missed in the previous sync.

diff --git a/ChangeLog b/ChangeLog
index 862d55eaafb7ad8e6eb73959022d9718054c43ce..c816276ccd7edd5953e3c996909adaf5a5e96823 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,14 @@
      [packet.c]
      Move some more statics into session_state
      ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
+     [kexdhs.c kexgexs.c]
+     abort if key_sign fails, preventing possible null deref.  Based on report
+     from Paolo Ganci, ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
+     [roaming.h roaming_common.c roaming_dummy.c]
+     Add  tags for the benefit of the sync scripts
+     Also: pull in the changes for 1.1->1.2 missed in the previous sync.
 
 20090616
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t

diff --git a/roaming.h b/roaming.h
index 88193453a87973df618a2fba808c773678c98416..e9946550209c512be69949f9a451b4f1ac550730 100644 (file)
--- a/roaming.h
+++ b/roaming.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: roaming.h,v 1.3 2009/06/21 09:04:03 dtucker Exp $ */
 /*
  * Copyright (c) 2004-2009 AppGate Network Security AB
  *
@@ -22,7 +23,7 @@ extern int resume_in_progress;
 void   add_recv_bytes(u_int64_t);
 ssize_t        roaming_write(int, const void *, size_t, int *);
 ssize_t        roaming_read(int, void *, size_t, int *);
-ssize_t        roaming_atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
+size_t roaming_atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
 u_int64_t      get_recv_bytes(void);
 u_int64_t      get_sent_bytes(void);
 void   roam_set_bytes(u_int64_t, u_int64_t);

diff --git a/roaming_common.c b/roaming_common.c
index 5a871b23e5239a7177cfc3e5024452d64a47aa2a..065542520c618ef02a7fa26f25391d40ea69c098 100644 (file)
--- a/roaming_common.c
+++ b/roaming_common.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: roaming_common.c,v 1.4 2009/06/21 09:04:03 dtucker Exp $ */
 /*
  * Copyright (c) 2004-2009 AppGate Network Security AB
  *
@@ -55,9 +56,9 @@ get_sent_bytes(void)
 }
 
 void
-roam_set_bytes(u_int64_t sent, u_int64_t recv)
+roam_set_bytes(u_int64_t sent, u_int64_t recvd)
 {
-       read_bytes = recv;
+       read_bytes = recvd;
        write_bytes = sent;
 }
 
@@ -70,7 +71,8 @@ roaming_write(int fd, const void *buf, size_t count, int *cont)
        if (ret > 0 && !resume_in_progress) {
                write_bytes += ret;
        }
-       debug("Wrote %d bytes for a total of %lld", ret, write_bytes);
+       debug3("Wrote %ld bytes for a total of %llu", (long)ret,
+           (unsigned long long)write_bytes);
        return ret;
 }
 
@@ -86,12 +88,13 @@ roaming_read(int fd, void *buf, size_t count, int *cont)
        return ret;
 }
 
-ssize_t
-roaming_atomicio(ssize_t(*f)(), int fd, void *buf, size_t count)
+size_t
+roaming_atomicio(ssize_t(*f)(int, void*, size_t), int fd, void *buf,
+    size_t count)
 {
-       ssize_t ret = atomicio(f, fd, buf, count);
+       size_t ret = atomicio(f, fd, buf, count);
 
-       if ((f == write || f == vwrite) && ret > 0 && !resume_in_progress) {
+       if (f == vwrite && ret > 0 && !resume_in_progress) {
                write_bytes += ret;
        } else if (f == read && ret > 0 && !resume_in_progress) {
                read_bytes += ret;

diff --git a/roaming_dummy.c b/roaming_dummy.c
index cd1d202574e82280bf5f9f326d9e1bcb949dc331..f081bffe94ff4795017ac3b45a7579079e515230 100644 (file)
--- a/roaming_dummy.c
+++ b/roaming_dummy.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: roaming_dummy.c,v 1.3 2009/06/21 09:04:03 dtucker Exp $ */
 /*
  * Copyright (c) 2004-2009 AppGate Network Security AB
  *
@@ -22,9 +23,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "roaming.h"
+
 int resume_in_progress = 0;
 
-u_int64_t get_recv_bytes()
+u_int64_t
+get_recv_bytes(void)
 {
        return 0;
 }
@@ -49,7 +53,7 @@ add_recv_bytes(u_int64_t num)
 }
 
 int
-resume_kex()
+resume_kex(void)
 {
        return 1;
 }