From b0e53bfaa1b0b33d60de762f65cc6c9bb646b890 Mon Sep 17 00:00:00 2001 From: Daniel Lenski Date: Sun, 23 Jan 2022 10:48:14 -0800 Subject: [PATCH] Cleanup whitespace in all human-maintained files Used Whitespace Total Fixer (https://github.com/dlenski/wtf) as follows: git ls-files | git check-attr --stdin text | grep -Ev 'unset|\.po|LICENSE|COPYING' | cut -f1 -d: | xargs wtf -i This intentionally excludes: 1. Nontext files, those where '-text' is explicitly set in .gitattributes 2. LICENSE/COPYING files (we never modify these) 3. '.po' files (not hand-edited) Signed-off-by: Daniel Lenski --- .gitattributes | 4 +++- android/Makefile | 2 +- android/install_symlink.sh | 1 - json/AUTHORS | 3 +-- json/json.c | 1 - json/json.h | 20 +++++++--------- openconnect.8.in | 2 +- tests/configs/test-dtls-psk.config | 1 - tests/configs/test-user-cert.config.in | 33 +++++++++++++------------- tests/configs/test-user-pass.config.in | 33 +++++++++++++------------- www/anyconnect.xml | 2 +- www/contribute.xml | 2 +- www/download.xml | 2 +- www/images/Makefile.am | 1 - www/inc/Makefile.am | 1 - www/inc/header.tmpl | 5 ++-- www/juniper.xml | 2 +- www/mail.xml | 2 +- www/manual.xml | 5 +--- www/pkcs11.xml | 12 +++++----- www/pulse.xml | 2 +- www/styles/Makefile.am | 1 - www/styles/main.css | 10 ++++---- 23 files changed, 67 insertions(+), 80 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0dbd0b60..d957120a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,5 +6,7 @@ *.p12 -text *.der -text -# SoftHSM objects +# SoftHSM and SwTPM objects *.object -text +tests/softhsm/*/generation -text +swtpm*.state -text diff --git a/android/Makefile b/android/Makefile index 703fcd79..036f0179 100644 --- a/android/Makefile +++ b/android/Makefile @@ -155,7 +155,7 @@ $(GMP_SRC)/configure: $(GMP_TAR) $(GMP_BUILD)/Makefile: $(TOOLCHAIN_BUILT) $(GMP_SRC)/configure mkdir -p $(GMP_BUILD) - cd $(GMP_BUILD) && ../../$(GMP_SRC)/configure $(CONFIGURE_ARGS) + cd $(GMP_BUILD) && ../../$(GMP_SRC)/configure $(CONFIGURE_ARGS) $(GMP_BUILD)/libgmp.la: $(GMP_BUILD)/Makefile diff --git a/android/install_symlink.sh b/android/install_symlink.sh index c4ed0078..6f47c341 100755 --- a/android/install_symlink.sh +++ b/android/install_symlink.sh @@ -25,4 +25,3 @@ if [ ! -z $MAKEDIR ]; then mkdir -p $1 fi cp -f $SRCS "$1" - diff --git a/json/AUTHORS b/json/AUTHORS index 17da2784..287e303b 100644 --- a/json/AUTHORS +++ b/json/AUTHORS @@ -12,10 +12,9 @@ Ivan Kozub Igor Gnatenko Haïkel Guémar Tobias Waldekranz -Patrick Donnelly +Patrick Donnelly Wilmer van der Gaast Jin Wei François Cartegnie Matthijs Boelstra Richard Selneck - diff --git a/json/json.c b/json/json.c index 1e878509..0b9246ea 100644 --- a/json/json.c +++ b/json/json.c @@ -1048,4 +1048,3 @@ void json_value_free (json_value * value) settings.mem_free = default_free; json_value_free_ex (&settings, value); } - diff --git a/json/json.h b/json/json.h index f6549ec4..713b6035 100644 --- a/json/json.h +++ b/json/json.h @@ -88,14 +88,14 @@ typedef enum } json_type; extern const struct _json_value json_value_none; - + typedef struct _json_object_entry { json_char * name; unsigned int name_length; - + struct _json_value * value; - + } json_object_entry; typedef struct _json_value @@ -190,7 +190,7 @@ typedef struct _json_value } inline const struct _json_value &operator [] (const char * index) const - { + { if (type != json_object) return json_value_none; @@ -202,7 +202,7 @@ typedef struct _json_value } inline operator const char * () const - { + { switch (type) { case json_string: @@ -214,7 +214,7 @@ typedef struct _json_value } inline operator json_int_t () const - { + { switch (type) { case json_integer: @@ -229,7 +229,7 @@ typedef struct _json_value } inline operator bool () const - { + { if (type != json_boolean) return false; @@ -237,7 +237,7 @@ typedef struct _json_value } inline operator double () const - { + { switch (type) { case json_integer: @@ -254,7 +254,7 @@ typedef struct _json_value #endif } json_value; - + json_value * json_parse (const json_char * json, size_t length); @@ -279,5 +279,3 @@ void json_value_free_ex (json_settings * settings, #endif #endif - - diff --git a/openconnect.8.in b/openconnect.8.in index 882d2f26..401de424 100644 --- a/openconnect.8.in +++ b/openconnect.8.in @@ -384,7 +384,7 @@ or as an URL containing the . I HOST and optionally the .I PORT -number and the login +number and the login .I GROUP or realm. diff --git a/tests/configs/test-dtls-psk.config b/tests/configs/test-dtls-psk.config index 4e7d719f..b84dff02 100644 --- a/tests/configs/test-dtls-psk.config +++ b/tests/configs/test-dtls-psk.config @@ -186,4 +186,3 @@ ping-leases = false #always-require-cert = false compression = false - diff --git a/tests/configs/test-user-cert.config.in b/tests/configs/test-user-cert.config.in index e365e8ce..1bdee5ed 100644 --- a/tests/configs/test-user-cert.config.in +++ b/tests/configs/test-user-cert.config.in @@ -1,6 +1,6 @@ # User authentication method. Could be set multiple times and in that case # all should succeed. -# Options: certificate, pam. +# Options: certificate, pam. auth = "certificate" auth = "plain[@abs_top_srcdir@/tests/configs/test1.passwd]" #auth = "pam" @@ -17,7 +17,7 @@ use-dbus = no #max-clients = 1024 max-clients = 16 -# Limit the number of client connections to one every X milliseconds +# Limit the number of client connections to one every X milliseconds # (X is the provided value). Set to zero for no limit. #rate-limit-ms = 100 @@ -43,7 +43,7 @@ dpd = 440 try-mtu-discovery = false # The key and the certificates of the server -# The key may be a file, or any URL supported by GnuTLS (e.g., +# The key may be a file, or any URL supported by GnuTLS (e.g., # tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user # or pkcs11:object=my-vpn-key;object-type=private) # @@ -80,14 +80,14 @@ ca-cert = @abs_top_srcdir@/tests/certs/ca.pem # The object identifier that will be used to read the user ID in the client certificate. # The object identifier should be part of the certificate's DN -# Useful OIDs are: +# Useful OIDs are: # CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1 cert-user-oid = 0.9.2342.19200300.100.1.1 -# The object identifier that will be used to read the user group in the client +# The object identifier that will be used to read the user group in the client # certificate. The object identifier should be part of the certificate's DN -# Useful OIDs are: -# OU (organizational unit) = 2.5.4.11 +# Useful OIDs are: +# OU (organizational unit) = 2.5.4.11 #cert-group-oid = 2.5.4.11 # A revocation list of ca-cert is set @@ -103,7 +103,7 @@ tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT:+SIGN-DSA-SHA1" # to authentication auth-timeout = 40 -# The time (in seconds) that a client is not allowed to reconnect after +# The time (in seconds) that a client is not allowed to reconnect after # a failed authentication attempt. #min-reauth-time = 2 @@ -115,7 +115,7 @@ cookie-validity = 172800 # Script to call when a client connects and obtains an IP # Parameters are passed on the environment. -# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), +# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), # DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP # in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON # may be "connect" or "disconnect". @@ -155,28 +155,28 @@ ipv4-dns = 192.168.1.1 # The NBNS server (if any) #ipv4-nbns = 192.168.2.3 -#ipv6-address = -#ipv6-mask = -#ipv6-dns = +#ipv6-address = +#ipv6-mask = +#ipv6-dns = # Prior to leasing any IP from the pool ping it to verify that # it is not in use by another (unrelated to this server) host. ping-leases = false # Leave empty to assign the default MTU of the device -# mtu = +# mtu = route = 192.168.1.0/255.255.255.0 #route = 192.168.5.0/255.255.255.0 # -# The following options are for (experimental) AnyConnect client -# compatibility. They are only available if the server is built +# The following options are for (experimental) AnyConnect client +# compatibility. They are only available if the server is built # with --enable-anyconnect # # Client profile xml. A sample file exists in doc/profile.xml. -# This file must be accessible from inside the worker's chroot. +# This file must be accessible from inside the worker's chroot. # The profile is ignored by the openconnect client. #user-profile = profile.xml @@ -185,4 +185,3 @@ route = 192.168.1.0/255.255.255.0 # cookie. Legacy CISCO clients do not do that, and thus this option # should be set for them. cisco-client-compat = true - diff --git a/tests/configs/test-user-pass.config.in b/tests/configs/test-user-pass.config.in index c5acd373..7d7785b2 100644 --- a/tests/configs/test-user-pass.config.in +++ b/tests/configs/test-user-pass.config.in @@ -1,6 +1,6 @@ # User authentication method. Could be set multiple times and in that case # all should succeed. -# Options: certificate, pam. +# Options: certificate, pam. #auth = "certificate" auth = "plain[@abs_top_srcdir@/tests/configs/test1.passwd]" #auth = "pam" @@ -17,7 +17,7 @@ use-dbus = no #max-clients = 1024 max-clients = 16 -# Limit the number of client connections to one every X milliseconds +# Limit the number of client connections to one every X milliseconds # (X is the provided value). Set to zero for no limit. rate-limit-ms = 0 @@ -42,7 +42,7 @@ dpd = 440 try-mtu-discovery = false # The key and the certificates of the server -# The key may be a file, or any URL supported by GnuTLS (e.g., +# The key may be a file, or any URL supported by GnuTLS (e.g., # tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user # or pkcs11:object=my-vpn-key;object-type=private) # @@ -79,14 +79,14 @@ ca-cert = @abs_top_srcdir@/tests/certs/ca.pem # The object identifier that will be used to read the user ID in the client certificate. # The object identifier should be part of the certificate's DN -# Useful OIDs are: +# Useful OIDs are: # CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1 cert-user-oid = 0.9.2342.19200300.100.1.1 -# The object identifier that will be used to read the user group in the client +# The object identifier that will be used to read the user group in the client # certificate. The object identifier should be part of the certificate's DN -# Useful OIDs are: -# OU (organizational unit) = 2.5.4.11 +# Useful OIDs are: +# OU (organizational unit) = 2.5.4.11 #cert-group-oid = 2.5.4.11 # A revocation list of ca-cert is set @@ -102,7 +102,7 @@ tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT" # to authentication auth-timeout = 40 -# The time (in seconds) that a client is not allowed to reconnect after +# The time (in seconds) that a client is not allowed to reconnect after # a failed authentication attempt. #min-reauth-time = 2 @@ -114,7 +114,7 @@ cookie-validity = 172800 # Script to call when a client connects and obtains an IP # Parameters are passed on the environment. -# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), +# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), # DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP # in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON # may be "connect" or "disconnect". @@ -154,28 +154,28 @@ ipv4-dns = 192.168.1.1 # The NBNS server (if any) #ipv4-nbns = 192.168.2.3 -#ipv6-address = -#ipv6-mask = -#ipv6-dns = +#ipv6-address = +#ipv6-mask = +#ipv6-dns = # Prior to leasing any IP from the pool ping it to verify that # it is not in use by another (unrelated to this server) host. ping-leases = false # Leave empty to assign the default MTU of the device -# mtu = +# mtu = route = 192.168.1.0/255.255.255.0 #route = 192.168.5.0/255.255.255.0 # -# The following options are for (experimental) AnyConnect client -# compatibility. They are only available if the server is built +# The following options are for (experimental) AnyConnect client +# compatibility. They are only available if the server is built # with --enable-anyconnect # # Client profile xml. A sample file exists in doc/profile.xml. -# This file must be accessible from inside the worker's chroot. +# This file must be accessible from inside the worker's chroot. # The profile is ignored by the openconnect client. #user-profile = profile.xml @@ -184,4 +184,3 @@ route = 192.168.1.0/255.255.255.0 # cookie. Legacy CISCO clients do not do that, and thus this option # should be set for them. cisco-client-compat = true - diff --git a/www/anyconnect.xml b/www/anyconnect.xml index b63fc7fe..8aa63169 100644 --- a/www/anyconnect.xml +++ b/www/anyconnect.xml @@ -5,7 +5,7 @@ - +

Cisco AnyConnect

diff --git a/www/contribute.xml b/www/contribute.xml index ea83425f..39257d15 100644 --- a/www/contribute.xml +++ b/www/contribute.xml @@ -3,7 +3,7 @@ - +

Contributing to OpenConnect

diff --git a/www/download.xml b/www/download.xml index b77e3bad..79a21561 100644 --- a/www/download.xml +++ b/www/download.xml @@ -5,7 +5,7 @@ - +

Download

diff --git a/www/images/Makefile.am b/www/images/Makefile.am index 4c409710..8b39a4f4 100644 --- a/www/images/Makefile.am +++ b/www/images/Makefile.am @@ -1,3 +1,2 @@ imagesdir = $(htmldir)/images dist_images_DATA = $(srcdir)/*.png $(srcdir)/*.svg - diff --git a/www/inc/Makefile.am b/www/inc/Makefile.am index 23297017..3da03243 100644 --- a/www/inc/Makefile.am +++ b/www/inc/Makefile.am @@ -1,3 +1,2 @@ tmpldatadir = $(htmldir)/inc dist_tmpldata_DATA = $(srcdir)/*.tmpl - diff --git a/www/inc/header.tmpl b/www/inc/header.tmpl index 6cdac922..7b982feb 100644 --- a/www/inc/header.tmpl +++ b/www/inc/header.tmpl @@ -9,10 +9,9 @@ - + -