3 files changed, 106 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 70fdad614..0ac0c0d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -130,6 +130,7 @@
    - markus@cvs.openbsd.org 2002/06/06 17:30:11
      [sftp-server.c]
      use get_int() macro (hide iqueue)
+ - (bal) Missed msg.[ch] in merge.  Required for ssh-keysign.
 
 20020604
  - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -814,4 +815,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2179 2002/06/06 21:58:35 mouring Exp $
+$Id: ChangeLog,v 1.2180 2002/06/07 01:51:06 mouring Exp $
diff --git a/msg.c b/msg.c
new file mode 100644
index 000000000..a159aae84
--- /dev/null
+++ b/msg.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2002 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "includes.h"
+RCSID("$OpenBSD: msg.c,v 1.1 2002/05/23 19:24:30 markus Exp $");
+
+#include "buffer.h"
+#include "getput.h"
+#include "log.h"
+#include "atomicio.h"
+#include "msg.h"
+
+void
+msg_send(int fd, u_char type, Buffer *m)
+{
+        u_char buf[5];
+        u_int mlen = buffer_len(m);
+
+        debug3("msg_send: type %d", type);
+
+        PUT_32BIT(buf, mlen + 1);
+        buf[4] = type;         /* 1st byte of payload is mesg-type */
+        if (atomicio(write, fd, buf, sizeof(buf)) != sizeof(buf))
+                fatal("msg_send: write");
+        if (atomicio(write, fd, buffer_ptr(m), mlen) != mlen)
+                fatal("msg_send: write");
+}
+
+int
+msg_recv(int fd, Buffer *m)
+{
+        u_char buf[4];
+        ssize_t res;
+        u_int msg_len;
+
+        debug3("msg_recv entering");
+
+        res = atomicio(read, fd, buf, sizeof(buf));
+        if (res != sizeof(buf)) {
+                if (res == 0)
+                        return -1;
+                fatal("msg_recv: read: header %d", res);
+        }
+        msg_len = GET_32BIT(buf);
+        if (msg_len > 256 * 1024)
+                fatal("msg_recv: read: bad msg_len %d", msg_len);
+        buffer_clear(m);
+        buffer_append_space(m, msg_len);
+        res = atomicio(read, fd, buffer_ptr(m), msg_len);
+        if (res != msg_len)
+                fatal("msg_recv: read: %ld != msg_len", (long)res);
+        return 0;
+}
diff --git a/msg.h b/msg.h
new file mode 100644
index 000000000..13fa95b27
--- /dev/null
+++ b/msg.h
@@ -0,0 +1,31 @@
+/*      $OpenBSD: msg.h,v 1.1 2002/05/23 19:24:30 markus Exp $  */
+/*
+ * Copyright (c) 2002 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SSH_MSG_H
+#define SSH_MSG_H
+
+void     msg_send(int, u_char, Buffer *);
+int      msg_recv(int, Buffer *);
+
+#endif