X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/82c2230a445b352ac67f3ed13bf7fa88b0bbac70..5befb07913169aa9449c29914401fccaa544677a:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index a570cda..711242b 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -44,7 +44,7 @@ To use this patch, run these commands for a successful build: -OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ +OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ @SSL_OBJS@ - TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o + TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ --- old/cleanup.c +++ new/cleanup.c @@ -85,10 +85,10 @@ To use this patch, run these commands for a successful build: extern int rsync_port; extern int ignore_errors; extern int kluge_around_eof; -@@ -106,8 +109,18 @@ int start_socket_client(char *host, char +@@ -112,8 +115,18 @@ int start_socket_client(char *host, int set_socket_options(fd, sockopts); - ret = start_inband_exchange(user, path, fd, fd, argc); + ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); + if (ret) + return ret; @@ -104,8 +104,8 @@ To use this patch, run these commands for a successful build: + return client_run(fd, fd, -1, argc, argv); } - int start_inband_exchange(const char *user, char *path, int f_in, int f_out, -@@ -168,6 +181,33 @@ int start_inband_exchange(const char *us + static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) +@@ -244,6 +257,32 @@ int start_inband_exchange(int f_in, int if (verbose > 1) print_child_argv(sargs); @@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build: + if (use_ssl) { + io_printf(f_out, "#starttls\n"); + while (1) { -+ if (!read_line(f_in, line, sizeof(line)-1)) { ++ if (!read_line_old(f_in, line, sizeof line)) { + rprintf(FERROR, "rsync: did not receive reply to #starttls\n"); + return -1; + } @@ -121,9 +121,8 @@ To use this patch, run these commands for a successful build: + rprintf(FERROR, "%s\n", line); + return -1; + } -+ if (strcmp(line, "@RSYNCD: starttls") == 0) { ++ if (strcmp(line, "@RSYNCD: starttls") == 0) + break; -+ } + rprintf(FINFO, "%s\n", line); + } + if (start_tls(f_in, f_out)) { @@ -136,10 +135,10 @@ To use this patch, run these commands for a successful build: + } +#endif + - p = strchr(path,'/'); - if (p) *p = 0; + p = strchr(path, '/'); + if (p) *p = '\0'; io_printf(f_out, "%s\n", path); -@@ -196,6 +236,10 @@ int start_inband_exchange(const char *us +@@ -272,6 +311,10 @@ int start_inband_exchange(int f_in, int * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ @@ -150,7 +149,7 @@ To use this patch, run these commands for a successful build: exit(0); } -@@ -203,6 +247,10 @@ int start_inband_exchange(const char *us +@@ -279,6 +322,10 @@ int start_inband_exchange(int f_in, int rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ @@ -161,17 +160,17 @@ To use this patch, run these commands for a successful build: return -1; } -@@ -785,6 +833,9 @@ int start_daemon(int f_in, int f_out) - if (protocol_version > remote_protocol) - protocol_version = remote_protocol; +@@ -807,6 +854,9 @@ int start_daemon(int f_in, int f_out) + if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0) + return -1; +#ifdef HAVE_OPENSSL +retry: +#endif line[0] = 0; - if (!read_line(f_in, line, sizeof line - 1)) + if (!read_line_old(f_in, line, sizeof line)) return -1; -@@ -796,6 +847,20 @@ int start_daemon(int f_in, int f_out) +@@ -818,6 +868,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -218,7 +217,7 @@ To use this patch, run these commands for a successful build: *cygwin* ) AC_MSG_RESULT(yes) --- old/options.c +++ new/options.c -@@ -174,6 +174,14 @@ int logfile_format_has_o_or_i = 0; +@@ -181,6 +181,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -233,40 +232,39 @@ To use this patch, run these commands for a successful build: #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; -@@ -206,6 +214,7 @@ static void print_rsync_version(enum log - char const *xattrs = "no "; +@@ -220,6 +228,7 @@ static void print_rsync_version(enum log char const *links = "no "; + char const *iconv = "no "; char const *ipv6 = "no "; + char const *ssl = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -234,6 +243,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -249,6 +258,9 @@ static void print_rsync_version(enum log + #ifdef ICONV_OPTION + iconv = ""; #endif - +#ifdef HAVE_OPENSSL + ssl = ""; +#endif -+ - if (SUBPROTOCOL_VERSION) - snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION); - else -@@ -250,8 +263,8 @@ static void print_rsync_version(enum log + + rprintf(f, "%s version %s protocol version %d%s\n", + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); +@@ -262,8 +274,8 @@ static void print_rsync_version(enum log (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); -- rprintf(f, " %sappend, %sACLs, %sxattrs\n", -- have_inplace, acls, xattrs); -+ rprintf(f, " %sappend, %sACLs, %sxattrs, %sSSL\n", -+ have_inplace, acls, xattrs, ssl); +- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", +- have_inplace, acls, xattrs, iconv); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %sSSL\n", ++ have_inplace, acls, xattrs, iconv, ssl); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -405,6 +418,13 @@ void usage(enum logcode F) +@@ -424,6 +436,13 @@ void usage(enum logcode F) + #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); - #endif +#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); + rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\n"); @@ -277,16 +275,16 @@ To use this patch, run these commands for a successful build: rprintf(F," --version print version number\n"); rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); -@@ -418,7 +438,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -437,7 +456,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, -+ OPT_NO_D, OPT_USE_SSL, +- OPT_NO_D, OPT_APPEND, ++ OPT_NO_D, OPT_APPEND, OPT_USE_SSL, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -576,6 +596,13 @@ static struct poptOption long_options[] +@@ -620,6 +639,13 @@ static struct poptOption long_options[] {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, @@ -300,10 +298,10 @@ To use this patch, run these commands for a successful build: /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, -@@ -603,6 +630,13 @@ static void daemon_usage(enum logcode F) +@@ -645,6 +671,13 @@ static void daemon_usage(enum logcode F) + rprintf(F," -v, --verbose increase verbosity\n"); rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); - #endif +#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); + rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\n"); @@ -314,7 +312,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -629,6 +663,13 @@ static struct poptOption long_daemon_opt +@@ -669,6 +702,13 @@ static struct poptOption long_daemon_opt {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, @@ -328,7 +326,7 @@ To use this patch, run these commands for a successful build: {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, -@@ -888,6 +929,12 @@ int parse_arguments(int *argc, const cha +@@ -943,6 +983,12 @@ int parse_arguments(int *argc_p, const c verbose++; break; @@ -341,7 +339,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -911,6 +958,17 @@ int parse_arguments(int *argc, const cha +@@ -966,6 +1012,17 @@ int parse_arguments(int *argc_p, const c exit_cleanup(RERR_SYNTAX); } @@ -356,10 +354,10 @@ To use this patch, run these commands for a successful build: + } +#endif + - *argv = poptGetArgs(pc); - *argc = count_args(*argv); + *argv_p = argv = poptGetArgs(pc); + *argc_p = argc = count_args(argv); am_starting_up = 0; -@@ -1155,6 +1213,12 @@ int parse_arguments(int *argc, const cha +@@ -1216,6 +1273,12 @@ int parse_arguments(int *argc_p, const c return 0; #endif @@ -372,7 +370,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1433,6 +1497,17 @@ int parse_arguments(int *argc, const cha +@@ -1530,6 +1593,17 @@ int parse_arguments(int *argc_p, const c if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -390,7 +388,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1864,10 +1939,27 @@ char *check_for_hostspec(char *s, char * +@@ -1997,10 +2071,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; @@ -430,7 +428,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -479,6 +480,11 @@ enum msgcode { +@@ -491,6 +492,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif @@ -439,9 +437,9 @@ To use this patch, run these commands for a successful build: +#include +#endif + - /* Starting from protocol version 26, we always use 64-bit - * ino_t and dev_t internally, even if this platform does not - * allow files to have 64-bit inums. That's because the + struct hashtable { + void *nodes; + int32 size, entries; --- old/ssl.c +++ new/ssl.c @@ -0,0 +1,370 @@