diff --git a/Makefile b/Makefile index 43c3eac..64a8355 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,9 @@ name = proxytunnel version = $(shell awk 'BEGIN { FS="\"" } /^\#define VERSION / { print $$2 }' config.h) -ifneq ($(wildcard .svn),) -revision = $(shell svnversion | awk 'BEGIN { RS=":" } { next } END { print $$1 }') -else -revision = $(shell echo '$$Revision$$' | sed -e 's/\$$Revision: \([0-9]\+\) \$$$$/\1/') -endif - CC ?= cc CFLAGS ?= -Wall -O2 -ggdb -OPTFLAGS = -DREVISION=\"$(revision)\" - # Comment on non-gnu systems OPTFLAGS += -DHAVE_GETOPT_LONG diff --git a/README b/README index 5594088..dab6766 100644 --- a/README +++ b/README @@ -3,8 +3,7 @@ proxytunnel ----------- Author: Jos Visser , Mark Janssen -Date: Mon Mar 3 22:49:43 CET 2008 -Version: 1.9.0 +Version: 1.9.1 Hi all, @@ -22,27 +21,32 @@ Proxytunnel is very easy to use, when running proxytunnel with the help option it specifies it's command-line options. $ ./proxytunnel --help -proxytunnel 1.9.0 (rev 224) Copyright 2001-2008 Proxytunnel Project +proxytunnel 1.9.1 Copyright 2001-2018 Proxytunnel Project Usage: proxytunnel [OPTIONS]... -Build generic tunnels through HTTPS proxies, supports HTTP authorization +Build generic tunnels through HTTPS proxies using HTTP authentication Standard options: - -i, --inetd Run from inetd (default=off) + -i, --inetd Run from inetd (default: off) -a, --standalone=INT Run as standalone daemon on specified port -p, --proxy=STRING Local proxy host:port combination -r, --remproxy=STRING Remote proxy host:port combination (using 2 proxies) -d, --dest=STRING Destination host:port combination -e, --encrypt SSL encrypt data between local proxy and destination -E, --encrypt-proxy SSL encrypt data between client and local proxy - -X, --encrypt-remproxy Encrypt between 1st and 2nd proxy using SSL + -X, --encrypt-remproxy SSL encrypt data between local and remote proxy + -L (legacy) enforce TLSv1 connection + -T, --no-ssl3 Do not connect using SSLv3 Additional options for specific features: + -z, --no-check-certficate Don't verify server SSL certificate + -C, --cacert=STRING Path to trusted CA certificate or directory -F, --passfile=STRING File with credentials for proxy authentication -P, --proxyauth=STRING Proxy auth credentials user:pass combination - -R, --remproxyauth=STRING Remote proxy auth credentials user:pass combination + -R, --remproxyauth=STRING Remote proxy auth credentials user:pass combination -N, --ntlm Use NTLM based authentication -t, --domain=STRING NTLM domain (default: autodetect) -H, --header=STRING Add additional HTTP headers to send to proxy + -o STRING send custom Host Header -x, --proctitle=STRING Use a different process title Miscellaneous options: @@ -51,7 +55,6 @@ Miscellaneous options: -h, --help Print help and exit -V, --version Print version and exit - To use this program with OpenSSH to connect to a host somewhere, create a $HOME/.ssh/config file with the following content: diff --git a/cmdline.c b/cmdline.c index 518d216..e1ee9b0 100644 --- a/cmdline.c +++ b/cmdline.c @@ -38,7 +38,7 @@ extern char * optarg; static char *getCredentialsFromFile( const char* filename, char **user, char **pass, char **rem_user, char **rem_pass); void cmdline_parser_print_version (void) { - printf ("%s %s (rev %s) Copyright 2001-2008 Proxytunnel Project\n", PACKAGE, VERSION, REVISION); + printf ("%s %s Copyright 2001-2018 Proxytunnel Project\n", PACKAGE, VERSION); } void cmdline_parser_print_help (void) {