1 files changed, 147 insertions, 12 deletions

diff --git a/misc.c b/misc.c
index 29e928886..625a34368 100644
--- a/misc.c
+++ b/misc.c
@@ -1,6 +1,7 @@
+/* $OpenBSD: misc.c,v 1.65 2006/11/23 01:35:11 ray Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
- * Copyright (c) 2005 Damien Miller.  All rights reserved.
+ * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,15 +25,35 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.42 2006/01/31 10:19:02 djm Exp $");
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/param.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#include <pwd.h>
+#endif
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>
 #endif
 
+#include "xmalloc.h"
 #include "misc.h"
 #include "log.h"
-#include "xmalloc.h"
+#include "ssh.h"
 
 /* remove newline at end of string */
 char *
@@ -123,6 +144,7 @@ set_nodelay(int fd)
 
 /* Characters considered whitespace in strsep calls. */
 #define WHITESPACE " \t\r\n"
+#define QUOTE   "\""
 
 /* return next token in configuration line */
 char *
@@ -136,15 +158,27 @@ strdelim(char **s)
 
         old = *s;
 
-        *s = strpbrk(*s, WHITESPACE "=");
+        *s = strpbrk(*s, WHITESPACE QUOTE "=");
         if (*s == NULL)
                 return (old);
 
+        if (*s[0] == '\"') {
+                memmove(*s, *s + 1, strlen(*s)); /* move nul too */
+                /* Find matching quote */
+                if ((*s = strpbrk(*s, QUOTE)) == NULL) {
+                        return (NULL);          /* no matching quote */
+                } else {
+                        *s[0] = '\0';
+                        return (old);
+                }
+        }
+
         /* Allow only one '=' to be skipped */
         if (*s[0] == '=')
                 wspace = 1;
         *s[0] = '\0';
 
+        /* Skip any extra whitespace after first token */
         *s += strspn(*s + 1, WHITESPACE) + 1;
         if (*s[0] == '=' && !wspace)
                 *s += strspn(*s + 1, WHITESPACE) + 1;
@@ -155,9 +189,8 @@ strdelim(char **s)
 struct passwd *
 pwcopy(struct passwd *pw)
 {
-        struct passwd *copy = xmalloc(sizeof(*copy));
+        struct passwd *copy = xcalloc(1, sizeof(*copy));
 
-        memset(copy, 0, sizeof(*copy));
         copy->pw_name = xstrdup(pw->pw_name);
         copy->pw_passwd = xstrdup(pw->pw_passwd);
         copy->pw_gecos = xstrdup(pw->pw_gecos);
@@ -280,6 +313,7 @@ convtime(const char *s)
                 switch (*endp++) {
                 case '\0':
                         endp--;
+                        break;
                 case 's':
                 case 'S':
                         break;
@@ -312,6 +346,23 @@ convtime(const char *s)
 }
 
 /*
+ * Returns a standardized host+port identifier string.
+ * Caller must free returned string.
+ */
+char *
+put_host_port(const char *host, u_short port)
+{
+        char *hoststr;
+
+        if (port == 0 || port == SSH_DEFAULT_PORT)
+                return(xstrdup(host));
+        if (asprintf(&hoststr, "[%s]:%d", host, (int)port) < 0)
+                fatal("put_host_port: asprintf: %s", strerror(errno));
+        debug3("put_host_port: %s", hoststr);
+        return hoststr;
+}
+
+/*
  * Search for next delimiter between hostnames/addresses and ports.
  * Argument may be modified (for termination).
  * Returns *cp if parsing succeeds.
@@ -408,7 +459,7 @@ addargs(arglist *args, char *fmt, ...)
         } else if (args->num+2 >= nalloc)
                 nalloc *= 2;
 
-        args->list = xrealloc(args->list, nalloc * sizeof(char *));
+        args->list = xrealloc(args->list, nalloc, sizeof(char *));
         args->nalloc = nalloc;
         args->list[args->num++] = cp;
         args->list[args->num] = NULL;
@@ -565,6 +616,8 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
    u_long *lineno)
 {
         while (fgets(buf, bufsz, f) != NULL) {
+                if (buf[0] == '\0')
+                        continue;
                 (*lineno)++;
                 if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
                         return 0;
@@ -673,18 +726,100 @@ sanitise_stdfd(void)
 }
 
 char *
-tohex(const u_char *d, u_int l)
+tohex(const void *vp, size_t l)
 {
+        const u_char *p = (const u_char *)vp;
         char b[3], *r;
-        u_int i, hl;
+        size_t i, hl;
+
+        if (l > 65536)
+                return xstrdup("tohex: length > 65536");
 
         hl = l * 2 + 1;
-        r = xmalloc(hl);
-        *r = '\0';
+        r = xcalloc(1, hl);
         for (i = 0; i < l; i++) {
-                snprintf(b, sizeof(b), "%02x", d[i]);
+                snprintf(b, sizeof(b), "%02x", p[i]);
                 strlcat(r, b, hl);
         }
         return (r);
 }
 
+u_int64_t
+get_u64(const void *vp)
+{
+        const u_char *p = (const u_char *)vp;
+        u_int64_t v;
+
+        v  = (u_int64_t)p[0] << 56;
+        v |= (u_int64_t)p[1] << 48;
+        v |= (u_int64_t)p[2] << 40;
+        v |= (u_int64_t)p[3] << 32;
+        v |= (u_int64_t)p[4] << 24;
+        v |= (u_int64_t)p[5] << 16;
+        v |= (u_int64_t)p[6] << 8;
+        v |= (u_int64_t)p[7];
+
+        return (v);
+}
+
+u_int32_t
+get_u32(const void *vp)
+{
+        const u_char *p = (const u_char *)vp;
+        u_int32_t v;
+
+        v  = (u_int32_t)p[0] << 24;
+        v |= (u_int32_t)p[1] << 16;
+        v |= (u_int32_t)p[2] << 8;
+        v |= (u_int32_t)p[3];
+
+        return (v);
+}
+
+u_int16_t
+get_u16(const void *vp)
+{
+        const u_char *p = (const u_char *)vp;
+        u_int16_t v;
+
+        v  = (u_int16_t)p[0] << 8;
+        v |= (u_int16_t)p[1];
+
+        return (v);
+}
+
+void
+put_u64(void *vp, u_int64_t v)
+{
+        u_char *p = (u_char *)vp;
+
+        p[0] = (u_char)(v >> 56) & 0xff;
+        p[1] = (u_char)(v >> 48) & 0xff;
+        p[2] = (u_char)(v >> 40) & 0xff;
+        p[3] = (u_char)(v >> 32) & 0xff;
+        p[4] = (u_char)(v >> 24) & 0xff;
+        p[5] = (u_char)(v >> 16) & 0xff;
+        p[6] = (u_char)(v >> 8) & 0xff;
+        p[7] = (u_char)v & 0xff;
+}
+
+void
+put_u32(void *vp, u_int32_t v)
+{
+        u_char *p = (u_char *)vp;
+
+        p[0] = (u_char)(v >> 24) & 0xff;
+        p[1] = (u_char)(v >> 16) & 0xff;
+        p[2] = (u_char)(v >> 8) & 0xff;
+        p[3] = (u_char)v & 0xff;
+}
+
+
+void
+put_u16(void *vp, u_int16_t v)
+{
+        u_char *p = (u_char *)vp;
+
+        p[0] = (u_char)(v >> 8) & 0xff;
+        p[1] = (u_char)v & 0xff;
+}