X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 888800c..8015bd6 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -36,9 +36,10 @@ To use this patch, run these commands for a successful build: make diff --git a/Makefile.in b/Makefile.in +index feacb90..3016643 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -40,7 +40,7 @@ OBJS3=progress.o pipe.o +@@ -41,7 +41,7 @@ OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o @@ -48,6 +49,7 @@ diff --git a/Makefile.in b/Makefile.in TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ diff --git a/cleanup.c b/cleanup.c +index 19ef072..506f575 100644 --- a/cleanup.c +++ b/cleanup.c @@ -25,6 +25,9 @@ @@ -59,8 +61,8 @@ diff --git a/cleanup.c b/cleanup.c +#endif extern int keep_partial; extern int got_xfer_error; - extern char *partial_dir; -@@ -121,6 +124,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) + extern int output_needs_newline; +@@ -127,6 +130,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) code, file, line); } @@ -76,9 +78,10 @@ diff --git a/cleanup.c b/cleanup.c #include "case_N.h" diff --git a/clientserver.c b/clientserver.c +index b6afe00..5467c72 100644 --- a/clientserver.c +++ b/clientserver.c -@@ -31,6 +31,9 @@ extern int am_sender; +@@ -30,6 +30,9 @@ extern int am_sender; extern int am_server; extern int am_daemon; extern int am_root; @@ -88,7 +91,7 @@ diff --git a/clientserver.c b/clientserver.c extern int rsync_port; extern int protect_args; extern int ignore_errors; -@@ -128,8 +131,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], +@@ -134,8 +137,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], #endif ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); @@ -108,8 +111,8 @@ diff --git a/clientserver.c b/clientserver.c } static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) -@@ -272,6 +285,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char - if (verbose > 1) +@@ -278,6 +291,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char + if (DEBUG_GTE(CMD, 1)) print_child_argv("sending daemon args:", sargs); +#ifdef HAVE_OPENSSL @@ -141,7 +144,7 @@ diff --git a/clientserver.c b/clientserver.c io_printf(f_out, "%.*s\n", modlen, modname); /* Old servers may just drop the connection here, -@@ -297,6 +336,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char +@@ -303,6 +342,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ @@ -152,7 +155,7 @@ diff --git a/clientserver.c b/clientserver.c exit(0); } -@@ -304,6 +347,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char +@@ -310,6 +353,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ @@ -163,7 +166,7 @@ diff --git a/clientserver.c b/clientserver.c return -1; } -@@ -934,6 +981,9 @@ int start_daemon(int f_in, int f_out) +@@ -1022,6 +1069,9 @@ int start_daemon(int f_in, int f_out) if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0) return -1; @@ -173,7 +176,7 @@ diff --git a/clientserver.c b/clientserver.c line[0] = 0; if (!read_line_old(f_in, line, sizeof line)) return -1; -@@ -945,6 +995,20 @@ int start_daemon(int f_in, int f_out) +@@ -1033,6 +1083,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -195,9 +198,10 @@ diff --git a/clientserver.c b/clientserver.c /* it's some sort of command that I don't understand */ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); diff --git a/configure.in b/configure.in +index bc7d4a7..73ca6c5 100644 --- a/configure.in +++ b/configure.in -@@ -295,6 +295,21 @@ if test x"$enable_locale" != x"no"; then +@@ -293,6 +293,21 @@ if test x"$enable_locale" != x"no"; then AC_DEFINE(CONFIG_LOCALE) fi @@ -220,9 +224,10 @@ diff --git a/configure.in b/configure.in case $host_os in *cygwin* ) AC_MSG_RESULT(yes) diff --git a/options.c b/options.c +index e7c6c61..634b89e 100644 --- a/options.c +++ b/options.c -@@ -185,6 +185,14 @@ int logfile_format_has_o_or_i = 0; +@@ -191,6 +191,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -237,7 +242,7 @@ diff --git a/options.c b/options.c #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; -@@ -225,6 +233,7 @@ static void print_rsync_version(enum logcode f) +@@ -566,6 +574,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -245,7 +250,7 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -258,6 +267,9 @@ static void print_rsync_version(enum logcode f) +@@ -599,6 +608,9 @@ static void print_rsync_version(enum logcode f) #if defined HAVE_LUTIMES && defined HAVE_UTIMES symtimes = ""; #endif @@ -255,7 +260,7 @@ diff --git a/options.c b/options.c rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -271,8 +283,8 @@ static void print_rsync_version(enum logcode f) +@@ -612,8 +624,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -266,7 +271,7 @@ diff --git a/options.c b/options.c #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -434,6 +446,13 @@ void usage(enum logcode F) +@@ -784,6 +796,13 @@ void usage(enum logcode F) #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -280,16 +285,16 @@ diff --git a/options.c b/options.c rprintf(F," --version print version number\n"); rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); -@@ -447,7 +466,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, +@@ -798,7 +817,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, 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_APPEND, OPT_NO_ICONV, -+ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_USE_SSL, + OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, +- OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, ++ OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_USE_SSL, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -650,6 +669,13 @@ static struct poptOption long_options[] = { +@@ -1012,6 +1031,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 }, @@ -303,7 +308,7 @@ diff --git a/options.c b/options.c /* 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 }, -@@ -675,6 +701,13 @@ static void daemon_usage(enum logcode F) +@@ -1039,6 +1065,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"); @@ -317,7 +322,7 @@ diff --git a/options.c b/options.c rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -699,6 +732,13 @@ static struct poptOption long_daemon_options[] = { +@@ -1064,6 +1097,13 @@ static struct poptOption long_daemon_options[] = { {"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 }, @@ -331,7 +336,7 @@ diff --git a/options.c b/options.c {"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 }, -@@ -980,6 +1020,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1358,6 +1398,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) verbose++; break; @@ -344,7 +349,7 @@ diff --git a/options.c b/options.c default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -1003,6 +1049,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1384,6 +1430,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) exit_cleanup(RERR_SYNTAX); } @@ -362,7 +367,7 @@ diff --git a/options.c b/options.c *argv_p = argv = poptGetArgs(pc); *argc_p = argc = count_args(argv); am_starting_up = 0; -@@ -1261,6 +1318,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1742,6 +1799,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -375,7 +380,7 @@ diff --git a/options.c b/options.c default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1594,6 +1657,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -2108,6 +2171,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -393,38 +398,30 @@ diff --git a/options.c b/options.c if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -2087,10 +2161,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) - char *p; - int not_host; - int hostlen; -- +@@ -2698,9 +2772,18 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) + { + char *path; + - if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) { -+ int url_prefix_len = sizeof URL_PREFIX - 1; -+ -+ if (!port_ptr) -+ url_prefix_len = 0; -+ else if (strncasecmp(URL_PREFIX, s, url_prefix_len) != 0) { -+#ifdef HAVE_OPENSSL -+ url_prefix_len = sizeof SSL_URL_PREFIX - 1; -+ if (strncasecmp(SSL_URL_PREFIX, s, url_prefix_len) != 0) -+ url_prefix_len = 0; -+ else { +- *host_ptr = parse_hostspec(s + strlen(URL_PREFIX), &path, port_ptr); +- if (*host_ptr) { ++ if (port_ptr) { ++ int url_prefix_len; ++ if (strncasecmp(URL_PREFIX, s, sizeof URL_PREFIX - 1) == 0) ++ url_prefix_len = sizeof URL_PREFIX - 1; ++ else if (strncasecmp(SSL_URL_PREFIX, s, sizeof SSL_URL_PREFIX - 1) == 0) { + if (!use_ssl) + init_tls(); + use_ssl = 1; -+ } -+#else -+ url_prefix_len = 0; -+#endif -+ } -+ if (url_prefix_len) { - char *path; -- s += strlen(URL_PREFIX); -+ s += url_prefix_len; - if ((p = strchr(s, '/')) != NULL) { - hostlen = p - s; - path = p + 1; ++ url_prefix_len = sizeof SSL_URL_PREFIX - 1; ++ } else ++ url_prefix_len = 0; ++ if (url_prefix_len && (*host_ptr = parse_hostspec(s + url_prefix_len, &path, port_ptr))) { + if (!*port_ptr) + *port_ptr = RSYNC_PORT; + return path; diff --git a/rsync.h b/rsync.h +index be7cf8a..7b7cc88 100644 --- a/rsync.h +++ b/rsync.h @@ -31,6 +31,7 @@ @@ -433,9 +430,9 @@ diff --git a/rsync.h b/rsync.h #define URL_PREFIX "rsync://" +#define SSL_URL_PREFIX "rsyncs://" - #define SYMLINK_PREFIX "/rsyncd-munged/" + #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ #define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) -@@ -549,6 +550,11 @@ typedef unsigned int size_t; +@@ -569,6 +570,11 @@ typedef unsigned int size_t; # define SIZEOF_INT64 SIZEOF_OFF_T #endif @@ -449,9 +446,10 @@ diff --git a/rsync.h b/rsync.h int32 size, entries; diff --git a/ssl.c b/ssl.c new file mode 100644 +index 0000000..f0d4d9f --- /dev/null +++ b/ssl.c -@@ -0,0 +1,370 @@ +@@ -0,0 +1,369 @@ +/* -*- c-file-style: "linux" -*- + * ssl.c: operations for negotiating SSL rsync connections. + * @@ -485,7 +483,6 @@ new file mode 100644 + +#define BUF_SIZE 1024 + -+extern int verbose; +extern int am_daemon; +extern int am_server; + @@ -571,7 +568,7 @@ new file mode 100644 + cbs = buf; + break; + } -+ if (verbose > 2) { ++ if (DEBUG_GTE(CONNECT, 1)) { + rprintf(FLOG, "SSL: info_callback(%p,%s,%d)\n", ssl, cbs, val); + if (cb == SSL_CB_HANDSHAKE_DONE) { + SSL_CIPHER_description(SSL_get_current_cipher((SSL*)ssl),