--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/10/06 13:57:39 214 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/02/10 12:56:34 317 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2003 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,21 +22,33 @@ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ #include /* getpwuid */ -#include /* PATH_MAX */ #include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ #include /* times */ #include "rdesktop.h" +#ifdef EGD_SOCKET +#include /* socket connect */ +#include /* sockaddr_un */ +#endif + +#ifdef WITH_OPENSSL +#include +#else +#include "crypto/md5.h" +#endif + char title[32] = ""; char username[16]; char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width = 800; +int width = 800; /* If width or height are reset to zero, the geometry will + be fetched from _NET_WORKAREA */ int height = 600; int tcp_port_rdp = TCP_PORT_RDP; +int server_bpp = 8; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; @@ -44,31 +56,35 @@ BOOL desktop_save = True; BOOL fullscreen = False; BOOL grab_keyboard = True; +BOOL hide_decorations = False; +extern BOOL owncolmap; /* Display usage information */ static void usage(char *program) { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); - fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n"); + fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2003 Matt Chapman.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); - fprintf(stderr, "Usage: %s [options] server\n", program); + fprintf(stderr, "Usage: %s [options] server[:port]\n", program); fprintf(stderr, " -u: user name\n"); fprintf(stderr, " -d: domain\n"); fprintf(stderr, " -s: shell\n"); fprintf(stderr, " -c: working directory\n"); fprintf(stderr, " -p: password (- to prompt)\n"); fprintf(stderr, " -n: client hostname\n"); - fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr etc.)\n"); + fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr,etc.)\n"); fprintf(stderr, " -g: desktop geometry (WxH)\n"); fprintf(stderr, " -f: full-screen mode\n"); fprintf(stderr, " -b: force bitmap updates\n"); fprintf(stderr, " -e: disable encryption (French TS)\n"); fprintf(stderr, " -m: do not send motion events\n"); - fprintf(stderr, " -t: rdp tcp port\n"); + fprintf(stderr, " -C: use private colour map\n"); fprintf(stderr, " -K: keep window manager key bindings\n"); - fprintf(stderr, " -w: window title\n"); + fprintf(stderr, " -T: window title\n"); + fprintf(stderr, " -D: hide window manager decorations\n"); + fprintf(stderr, " -a: server bpp\n"); } static BOOL @@ -111,28 +127,31 @@ int main(int argc, char *argv[]) { + char server[64]; char fullhostname[64]; char domain[16]; char password[16]; - char shell[32]; + char shell[128]; char directory[32]; BOOL prompt_password; struct passwd *pw; - char *server, *p; uint32 flags; + char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; - strcpy(keymapname, "us"); + strcpy(keymapname, "en-us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:t:fbemKw:h?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:a:fbemCKT:Dh?")) != -1) { switch (c) { case 'u': STRNCPY(username, optarg, sizeof(username)); + username_option = 1; break; case 'd': @@ -172,6 +191,12 @@ break; case 'g': + if (!strcmp(optarg, "workarea")) + { + width = height = 0; + break; + } + width = strtol(optarg, &p, 10); if (*p == 'x') height = strtol(p + 1, NULL, 10); @@ -199,16 +224,29 @@ sendmotion = False; break; - case 't': - tcp_port_rdp = strtol(optarg, NULL, 10); + case 'C': + owncolmap = True; break; case 'K': grab_keyboard = False; break; - case 'w': - strncpy(title, optarg, sizeof(title)); + case 'T': + STRNCPY(title, optarg, sizeof(title)); + break; + + case 'D': + hide_decorations = True; + break; + + case 'a': + server_bpp = strtol(optarg, NULL, 10); + if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15 && server_bpp != 24) + { + error("invalid server bpp\n"); + return 1; + } break; case 'h': @@ -225,9 +263,15 @@ return 1; } - server = argv[optind]; + STRNCPY(server, argv[optind], sizeof(server)); + p = strchr(server, ':'); + if (p != NULL) + { + tcp_port_rdp = strtol(p + 1, NULL, 10); + *p = 0; + } - if (username[0] == 0) + if (!username_option) { pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) @@ -284,25 +328,72 @@ return 0; } +#ifdef EGD_SOCKET +/* Read 32 random bytes from PRNGD or EGD socket (based on OpenSSL RAND_egd) */ +static BOOL +generate_random_egd(uint8 * buf) +{ + struct sockaddr_un addr; + BOOL ret = False; + int fd; + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return False; + + addr.sun_family = AF_UNIX; + memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET)); + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) + goto err; + + /* PRNGD and EGD use a simple communications protocol */ + buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ + buf[1] = 32; /* Number of requested random bytes */ + if (write(fd, buf, 2) != 2) + goto err; + + if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ + goto err; + + if (read(fd, buf, 32) != 32) + goto err; + + ret = True; + + err: + close(fd); + return ret; +} +#endif + /* Generate a 32-byte random for the secure transport code. */ void generate_random(uint8 * random) { struct stat st; struct tms tmsbuf; - uint32 *r = (uint32 *) random; - int fd; + MD5_CTX md5; + uint32 *r; + int fd, n; - /* If we have a kernel random device, use it. */ + /* If we have a kernel random device, try that first */ if (((fd = open("/dev/urandom", O_RDONLY)) != -1) || ((fd = open("/dev/random", O_RDONLY)) != -1)) { - read(fd, random, 32); + n = read(fd, random, 32); close(fd); - return; + if (n == 32) + return; } +#ifdef EGD_SOCKET + /* As a second preference use an EGD */ + if (generate_random_egd(random)) + return; +#endif + /* Otherwise use whatever entropy we can gather - ideas welcome. */ + r = (uint32 *) random; r[0] = (getpid()) | (getppid() << 16); r[1] = (getuid()) | (getgid() << 16); r[2] = times(&tmsbuf); /* system uptime (clocks) */ @@ -311,6 +402,13 @@ r[5] = st.st_atime; r[6] = st.st_mtime; r[7] = st.st_ctime; + + /* Hash both halves with MD5 to obscure possible patterns */ + MD5_Init(&md5); + MD5_Update(&md5, random, 16); + MD5_Final(random, &md5); + MD5_Update(&md5, random + 16, 16); + MD5_Final(random + 16, &md5); } /* malloc; exit if out of memory */ @@ -359,6 +457,19 @@ va_end(ap); } +/* report a warning */ +void +warning(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + /* report an unimplemented protocol feature */ void unimpl(char *format, ...) @@ -402,58 +513,3 @@ } } -#ifdef SAVE_LICENCE -int -load_licence(unsigned char **data) -{ - char path[PATH_MAX]; - char *home; - struct stat st; - int fd; - - home = getenv("HOME"); - if (home == NULL) - return -1; - - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); - - fd = open(path, O_RDONLY); - if (fd == -1) - return -1; - - if (fstat(fd, &st)) - return -1; - - *data = xmalloc(st.st_size); - return read(fd, *data, st.st_size); -} - -void -save_licence(unsigned char *data, int length) -{ - char path[PATH_MAX]; - char *home; - int fd; - - home = getenv("HOME"); - if (home == NULL) - return; - - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); - mkdir(path, 0700); - - strncat(path, "/licence", sizeof(path) - strlen(path) - 1); - - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (fd == -1) - { - perror("open"); - return; - } - - write(fd, data, length); - close(fd); -} -#endif