From: "cron2 (Code Review)" Date: Tue, 5 Aug 2025 13:37:01 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="NoUlyBN5ZqI="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: clang-format: Switch to ColumnLimit 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --NoUlyBN5ZqI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2. cron2 has uploaded a new patch set (#3) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1129?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: clang-format: Switch to ColumnLimit 0 ...................................................................... clang-format: Switch to ColumnLimit 0 In some cases an actual ColumnLimit leads to unfortunate formatting. So leave the decision to developers after all. This commit contains: - changes that clang-format did as reaction to the config change - manual cleanups of these changes - manual cleanup of some previous changes done with ColumnLimit 100 Change-Id: Ibd900adfc775b7f785f1d5630184a124f5d8ff4b Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250805132706.27619-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 523.html Signed-off-by: Gert Doering --- M .clang-format M sample/sample-plugins/client-connect/sample-client-connect.c M sample/sample-plugins/log/log_v3.c M sample/sample-plugins/simple/base64.c M src/openvpn/crypto_openssl.c M src/openvpn/errlevel.h M src/openvpn/error.c M src/openvpn/mtu.c M src/openvpn/multi.c M src/openvpn/ntlm.c M src/openvpn/openvpn.c M src/openvpn/options.c M src/openvpn/options.h M src/openvpn/options_util.c M src/openvpn/run_command.h M src/openvpn/ssl_common.h M src/openvpn/xkey_helper.c M src/tapctl/tap.c M tests/unit_tests/openvpn/test_pkt.c 19 files changed, 149 insertions(+), 152 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/1129/3 diff --git a/.clang-format b/.clang-format index c314fca..1cce4c3 100644 --- a/.clang-format +++ b/.clang-format @@ -24,7 +24,7 @@ BreakBeforeBraces: Allman BreakBeforeTernaryOperators: true BreakStringLiterals: false -ColumnLimit: '100' +ColumnLimit: '0' ContinuationIndentWidth: '4' DerivePointerAlignment: false IndentCaseLabels: true diff --git a/sample/sample-plugins/client-connect/sample-client-connect.c b= /sample/sample-plugins/client-connect/sample-client-connect.c index 7e3b5a9..eaa07d2 100644 --- a/sample/sample-plugins/client-connect/sample-client-connect.c +++ b/sample/sample-plugins/client-connect/sample-client-connect.c @@ -128,9 +128,8 @@ /* Check API compatibility -- struct version 5 or higher needed */ if (v3structver < 5) { - fprintf( - stderr, - "sample-client-connect: this plugin is incompatible with the r= unning version of OpenVPN\n"); + fprintf(stderr, + "sample-client-connect: this plugin is incompatible with t= he running version of OpenVPN\n"); return OPENVPN_PLUGIN_FUNC_ERROR; } diff --git a/sample/sample-plugins/log/log_v3.c b/sample/sample-plugins/log= /log_v3.c index cef22cf..1b43947 100644 --- a/sample/sample-plugins/log/log_v3.c +++ b/sample/sample-plugins/log/log_v3.c @@ -80,8 +80,7 @@ /* Check that we are API compatible */ if (v3structver !=3D OPENVPN_PLUGINv3_STRUCTVER) { - printf( - "log_v3: ** ERROR ** Incompatible plug-in interface between th= is plug-in and OpenVPN\n"); + printf("log_v3: ** ERROR ** Incompatible plug-in interface between= this plug-in and OpenVPN\n"); return OPENVPN_PLUGIN_FUNC_ERROR; } diff --git a/sample/sample-plugins/simple/base64.c b/sample/sample-plugins/= simple/base64.c index 8a1dedd..8ca0888 100644 --- a/sample/sample-plugins/simple/base64.c +++ b/sample/sample-plugins/simple/base64.c @@ -104,8 +104,7 @@ /* Check that we are API compatible */ if (v3structver !=3D OPENVPN_PLUGINv3_STRUCTVER) { - printf( - "base64.c: ** ERROR ** Incompatible plug-in interface between = this plug-in and OpenVPN\n"); + printf("base64.c: ** ERROR ** Incompatible plug-in interface betwe= en this plug-in and OpenVPN\n"); return OPENVPN_PLUGIN_FUNC_ERROR; } diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index cfea3eb..4fb6393 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -1046,11 +1046,16 @@ * this translation table for forward lookup, only for returning the name * with md_kt_name() */ const cipher_name_pair digest_name_translation_table[] =3D { - { "BLAKE2s256", "BLAKE2S-256" }, { "BLAKE2b512", "BLAKE2B-512" }, - { "RIPEMD160", "RIPEMD-160" }, { "SHA224", "SHA2-224" }, - { "SHA256", "SHA2-256" }, { "SHA384", "SHA2-384" }, - { "SHA512", "SHA2-512" }, { "SHA512-224", "SHA2-512/224" }, - { "SHA512-256", "SHA2-512/256" }, { "SHAKE128", "SHAKE-128" }, + { "BLAKE2s256", "BLAKE2S-256" }, + { "BLAKE2b512", "BLAKE2B-512" }, + { "RIPEMD160", "RIPEMD-160" }, + { "SHA224", "SHA2-224" }, + { "SHA256", "SHA2-256" }, + { "SHA384", "SHA2-384" }, + { "SHA512", "SHA2-512" }, + { "SHA512-224", "SHA2-512/224" }, + { "SHA512-256", "SHA2-512/256" }, + { "SHAKE128", "SHAKE-128" }, { "SHAKE256", "SHAKE-256" }, }; const size_t digest_name_translation_table_count =3D diff --git a/src/openvpn/errlevel.h b/src/openvpn/errlevel.h index 2d33d55..f1ae8c5 100644 --- a/src/openvpn/errlevel.h +++ b/src/openvpn/errlevel.h @@ -49,73 +49,73 @@ * of output. */ -#define M_VERB0 LOGLEV(0, 0, 0) /* Messages displayed even at --verb 0 (fa= tal errors only) */ +#define M_VERB0 LOGLEV(0, 0, 0) /* Messages displayed = even at --verb 0 (fatal errors only) */ -#define M_INFO LOGLEV(1, 0, 0) /* default informational messages */ +#define M_INFO LOGLEV(1, 0, 0) /* default information= al messages */ -#define D_LINK_ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors fro= m main event loop */ -#define D_CRYPT_ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from enc= rypt/decrypt */ -#define D_TLS_ERRORS LOGLEV(1, 3, M_NONFATAL) /* show TLS control cha= nnel errors */ -#define D_RESOLVE_ERRORS LOGLEV(1, 4, M_NONFATAL) /* show hostname resolv= e errors */ -#define D_COMP_ERRORS LOGLEV(1, 5, M_NONFATAL) /* show compression err= ors */ -#define D_REPLAY_ERRORS LOGLEV(1, 6, M_NONFATAL) /* show packet replay e= rrors */ -#define D_STREAM_ERRORS LOGLEV(1, 7, M_NONFATAL) /* TCP stream error req= uiring restart */ -#define D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /* show server import o= ption errors */ -#define D_MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* show multi-client se= rver errors */ -#define D_EVENT_ERRORS LOGLEV(1, 10, M_NONFATAL) /* show event.[ch] erro= rs */ -#define D_PUSH_ERRORS LOGLEV(1, 11, M_NONFATAL) /* show push/pull error= s */ -#define D_PID_PERSIST LOGLEV(1, 12, M_NONFATAL) /* show packet_id persi= st errors */ -#define D_FRAG_ERRORS LOGLEV(1, 13, M_NONFATAL) /* show fragmentation e= rrors */ -#define D_ALIGN_ERRORS LOGLEV(1, 14, M_NONFATAL) /* show bad struct alig= nments */ +#define D_LINK_ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors fr= om main event loop */ +#define D_CRYPT_ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from en= crypt/decrypt */ +#define D_TLS_ERRORS LOGLEV(1, 3, M_NONFATAL) /* show TLS control ch= annel errors */ +#define D_RESOLVE_ERRORS LOGLEV(1, 4, M_NONFATAL) /* show hostname resol= ve errors */ +#define D_COMP_ERRORS LOGLEV(1, 5, M_NONFATAL) /* show compression er= rors */ +#define D_REPLAY_ERRORS LOGLEV(1, 6, M_NONFATAL) /* show packet replay = errors */ +#define D_STREAM_ERRORS LOGLEV(1, 7, M_NONFATAL) /* TCP stream error re= quiring restart */ +#define D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /* show server import = option errors */ +#define D_MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* show multi-client s= erver errors */ +#define D_EVENT_ERRORS LOGLEV(1, 10, M_NONFATAL) /* show event.[ch] err= ors */ +#define D_PUSH_ERRORS LOGLEV(1, 11, M_NONFATAL) /* show push/pull erro= rs */ +#define D_PID_PERSIST LOGLEV(1, 12, M_NONFATAL) /* show packet_id pers= ist errors */ +#define D_FRAG_ERRORS LOGLEV(1, 13, M_NONFATAL) /* show fragmentation = errors */ +#define D_ALIGN_ERRORS LOGLEV(1, 14, M_NONFATAL) /* show bad struct ali= gnments */ -#define D_HANDSHAKE LOGLEV(2, 20, 0) /* show data & control = channel handshakes */ -#define D_CLOSE LOGLEV(2, 22, 0) /* show socket and TUN/= TAP close */ -#define D_PROXY LOGLEV(2, 24, 0) /* show http proxy cont= rol packets */ -#define D_ARGV LOGLEV(2, 25, 0) /* show struct argv err= ors */ +#define D_HANDSHAKE LOGLEV(2, 20, 0) /* show data & control= channel handshakes */ +#define D_CLOSE LOGLEV(2, 22, 0) /* show socket and TUN= /TAP close */ +#define D_PROXY LOGLEV(2, 24, 0) /* show http proxy con= trol packets */ +#define D_ARGV LOGLEV(2, 25, 0) /* show struct argv er= rors */ -#define D_TLS_DEBUG_LOW LOGLEV(3, 20, 0) /* low frequency info from = tls_session routines */ -#define D_GREMLIN LOGLEV(3, 30, 0) /* show simulated outage in= fo from gremlin module */ -#define D_GENKEY LOGLEV(3, 31, 0) /* print message after key = generation */ -#define D_ROUTE LOGLEV(3, 0, 0) /* show routes added and de= leted (don't mute) */ -#define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debugging info from= TUN/TAP driver */ -#define D_RESTART LOGLEV(3, 33, 0) /* show certain restart mes= sages */ -#define D_PUSH LOGLEV(3, 34, 0) /* show push/pull info */ -#define D_IFCONFIG_POOL LOGLEV(3, 35, 0) /* show ifconfig pool info = */ -#define D_AUTH LOGLEV(3, 37, 0) /* show user/pass auth info= */ -#define D_MULTI_LOW LOGLEV(3, 38, 0) /* show point-to-multipoint= low-freq debug info */ -#define D_PLUGIN LOGLEV(3, 39, 0) /* show plugin calls */ -#define D_MANAGEMENT LOGLEV(3, 40, 0) /* show --management info */ -#define D_SCHED_EXIT LOGLEV(3, 41, 0) /* show arming of scheduled= exit */ -#define D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* show route quota exceede= d messages */ -#define D_OSBUF LOGLEV(3, 43, 0) /* show socket/tun/tap buff= er sizes */ -#define D_PS_PROXY LOGLEV(3, 44, 0) /* messages related to --po= rt-share option */ -#define D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info (don'= t mute) */ -#define D_DCO LOGLEV(3, 0, 0) /* show DCO related message= s */ +#define D_TLS_DEBUG_LOW LOGLEV(3, 20, 0) /* low frequency info = from tls_session routines */ +#define D_GREMLIN LOGLEV(3, 30, 0) /* show simulated outa= ge info from gremlin module */ +#define D_GENKEY LOGLEV(3, 31, 0) /* print message after= key generation */ +#define D_ROUTE LOGLEV(3, 0, 0) /* show routes added a= nd deleted (don't mute) */ +#define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debugging info= from TUN/TAP driver */ +#define D_RESTART LOGLEV(3, 33, 0) /* show certain restar= t messages */ +#define D_PUSH LOGLEV(3, 34, 0) /* show push/pull info= */ +#define D_IFCONFIG_POOL LOGLEV(3, 35, 0) /* show ifconfig pool = info */ +#define D_AUTH LOGLEV(3, 37, 0) /* show user/pass auth= info */ +#define D_MULTI_LOW LOGLEV(3, 38, 0) /* show point-to-multi= point low-freq debug info */ +#define D_PLUGIN LOGLEV(3, 39, 0) /* show plugin calls */ +#define D_MANAGEMENT LOGLEV(3, 40, 0) /* show --management i= nfo */ +#define D_SCHED_EXIT LOGLEV(3, 41, 0) /* show arming of sche= duled exit */ +#define D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* show route quota ex= ceeded messages */ +#define D_OSBUF LOGLEV(3, 43, 0) /* show socket/tun/tap= buffer sizes */ +#define D_PS_PROXY LOGLEV(3, 44, 0) /* messages related to= --port-share option */ +#define D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info = (don't mute) */ +#define D_DCO LOGLEV(3, 0, 0) /* show DCO related me= ssages */ -#define D_SHOW_PARMS LOGLEV(4, 50, 0) /* show all parameters on p= rogram initiation */ -#define D_LOW LOGLEV(4, 52, 0) /* miscellaneous low-freque= ncy debug info */ -#define D_DHCP_OPT LOGLEV(4, 53, 0) /* show DHCP options binary= string */ -#define D_MBUF LOGLEV(4, 54, 0) /* mbuf.[ch] routines */ -#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) /* PACKET_TRUNCATION_CHECK = */ -#define D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-multipoint= packet drops */ -#define D_MULTI_MEDIUM LOGLEV(4, 58, 0) /* show medium frequency mu= lti messages */ -#define D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track attribut= es on connection */ -#define D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequency in= it messages */ -#define D_MTU_INFO LOGLEV(4, 61, 0) /* show terse MTU info */ -#define D_PID_DEBUG_LOW LOGLEV(4, 63, 0) /* show low-freq packet-id = debugging info */ -#define D_PID_DEBUG_MEDIUM LOGLEV(4, 64, 0) /* show medium-freq packet-= id debugging info */ -#define D_CIPHER_INIT LOGLEV(4, 65, 0) /* show messages about ciph= er init */ +#define D_SHOW_PARMS LOGLEV(4, 50, 0) /* show all parameters= on program initiation */ +#define D_LOW LOGLEV(4, 52, 0) /* miscellaneous low-f= requency debug info */ +#define D_DHCP_OPT LOGLEV(4, 53, 0) /* show DHCP options b= inary string */ +#define D_MBUF LOGLEV(4, 54, 0) /* mbuf.[ch] routines = */ +#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) /* PACKET_TRUNCATION_C= HECK */ +#define D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-multi= point packet drops */ +#define D_MULTI_MEDIUM LOGLEV(4, 58, 0) /* show medium frequen= cy multi messages */ +#define D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track att= ributes on connection */ +#define D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequen= cy init messages */ +#define D_MTU_INFO LOGLEV(4, 61, 0) /* show terse MTU info= */ +#define D_PID_DEBUG_LOW LOGLEV(4, 63, 0) /* show low-freq packe= t-id debugging info */ +#define D_PID_DEBUG_MEDIUM LOGLEV(4, 64, 0) /* show medium-freq pa= cket-id debugging info */ +#define D_CIPHER_INIT LOGLEV(4, 65, 0) /* show messages about= cipher init */ -#define D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W' to stdo= ut for read/write */ +#define D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W' to= stdout for read/write */ -#define D_RTNL LOGLEV(6, 68, M_DEBUG) /* show RTNL low level oper= ations */ -#define D_LINK_RW LOGLEV(6, 69, M_DEBUG) /* show TCP/UDP reads/write= s (terse) */ -#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) /* show TUN/TAP reads/write= s */ -#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show TAP-Windows driver = debug info */ -#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show client NAT debug in= fo */ -#define D_XKEY LOGLEV(6, 69, M_DEBUG) /* show xkey-provider debug= info */ -#define D_DCO_DEBUG LOGLEV(6, 69, M_DEBUG) /* show DCO related lowleve= l debug messages */ -#define D_SIGNAL_DEBUG LOGLEV(6, 69, M_DEBUG) /* show signal related debu= g messages */ +#define D_RTNL LOGLEV(6, 68, M_DEBUG) /* show RTNL low level= operations */ +#define D_LINK_RW LOGLEV(6, 69, M_DEBUG) /* show TCP/UDP reads/= writes (terse) */ +#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) /* show TUN/TAP reads/= writes */ +#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show TAP-Windows dr= iver debug info */ +#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show client NAT deb= ug info */ +#define D_XKEY LOGLEV(6, 69, M_DEBUG) /* show xkey-provider = debug info */ +#define D_DCO_DEBUG LOGLEV(6, 69, M_DEBUG) /* show DCO related lo= wlevel debug messages */ +#define D_SIGNAL_DEBUG LOGLEV(6, 69, M_DEBUG) /* show signal related= debug messages */ #define D_SHOW_KEYS LOGLEV(7, 70, M_DEBUG) /* show data channel e= ncryption keys */ #define D_SHOW_KEY_SOURCE LOGLEV(7, 70, M_DEBUG) /* show data channel k= ey source entropy */ @@ -150,32 +150,32 @@ #define D_SHOW_OCC LOGLEV(7, 74, M_DEBUG) /* show options compat= ibility string */ -#define D_VLAN_DEBUG LOGLEV(7, 74, M_DEBUG) /* show VLAN tagging/un= tagging debug info */ +#define D_VLAN_DEBUG LOGLEV(7, 74, M_DEBUG) /* show VLAN taggi= ng/untagging debug info */ -#define D_HANDSHAKE_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show detailed descri= ption of handshake */ -#define D_TLS_DEBUG_MED LOGLEV(8, 70, M_DEBUG) /* limited info from tl= s_session routines */ -#define D_INTERVAL LOGLEV(8, 70, M_DEBUG) /* show interval.h debu= gging info */ -#define D_SCHEDULER LOGLEV(8, 70, M_DEBUG) /* show scheduler debug= ging info */ -#define D_GREMLIN_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show verbose info fr= om gremlin module */ -#define D_REL_DEBUG LOGLEV(8, 70, M_DEBUG) /* show detailed info f= rom reliable routines */ -#define D_EVENT_WAIT LOGLEV(8, 70, M_DEBUG) /* show detailed info f= rom event waits */ -#define D_MULTI_TCP LOGLEV(8, 70, M_DEBUG) /* show debug info from= mtcp.c */ +#define D_HANDSHAKE_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show detailed d= escription of handshake */ +#define D_TLS_DEBUG_MED LOGLEV(8, 70, M_DEBUG) /* limited info fr= om tls_session routines */ +#define D_INTERVAL LOGLEV(8, 70, M_DEBUG) /* show interval.h= debugging info */ +#define D_SCHEDULER LOGLEV(8, 70, M_DEBUG) /* show scheduler = debugging info */ +#define D_GREMLIN_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show verbose in= fo from gremlin module */ +#define D_REL_DEBUG LOGLEV(8, 70, M_DEBUG) /* show detailed i= nfo from reliable routines */ +#define D_EVENT_WAIT LOGLEV(8, 70, M_DEBUG) /* show detailed i= nfo from event waits */ +#define D_MULTI_TCP LOGLEV(8, 70, M_DEBUG) /* show debug info= from mtcp.c */ -#define D_TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed info f= rom TLS routines */ -#define D_COMP LOGLEV(9, 70, M_DEBUG) /* show compression inf= o */ -#define D_READ_WRITE LOGLEV(9, 70, M_DEBUG) /* show all tun/tcp/udp= reads/writes/opens */ -#define D_PACKET_CONTENT LOGLEV(9, 70, M_DEBUG) /* show before/after en= cryption packet content */ -#define D_TLS_NO_SEND_KEY LOGLEV(9, 70, M_DEBUG) /* show when no data ch= annel send-key exists */ -#define D_PID_PERSIST_DEBUG LOGLEV(9, 70, M_DEBUG) /* show packet-id persi= st debugging info */ -#define D_LINK_RW_VERBOSE LOGLEV(9, 70, M_DEBUG) /* increase link reads/= writes verbosity */ -#define D_STREAM_DEBUG LOGLEV(9, 70, M_DEBUG) /* show TCP stream debu= g info */ -#define D_WIN32_IO LOGLEV(9, 70, M_DEBUG) /* win32 I/O debugging = info */ -#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) /* show PKCS#11 debuggi= ng */ +#define D_TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed i= nfo from TLS routines */ +#define D_COMP LOGLEV(9, 70, M_DEBUG) /* show compressio= n info */ +#define D_READ_WRITE LOGLEV(9, 70, M_DEBUG) /* show all tun/tc= p/udp reads/writes/opens */ +#define D_PACKET_CONTENT LOGLEV(9, 70, M_DEBUG) /* show before/aft= er encryption packet content */ +#define D_TLS_NO_SEND_KEY LOGLEV(9, 70, M_DEBUG) /* show when no da= ta channel send-key exists */ +#define D_PID_PERSIST_DEBUG LOGLEV(9, 70, M_DEBUG) /* show packet-id = persist debugging info */ +#define D_LINK_RW_VERBOSE LOGLEV(9, 70, M_DEBUG) /* increase link r= eads/writes verbosity */ +#define D_STREAM_DEBUG LOGLEV(9, 70, M_DEBUG) /* show TCP stream= debug info */ +#define D_WIN32_IO LOGLEV(9, 70, M_DEBUG) /* win32 I/O debug= ging info */ +#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) /* show PKCS#11 de= bugging */ -#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) /* show traffic shaper = info */ +#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) /* show traffic sh= aper info */ -#define D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* win32 registry debug= ging info */ -#define D_OPENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenSSL locks */ +#define D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* win32 registry = debugging info */ +#define D_OPENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenSSL lo= cks */ /*#define D_THREAD_DEBUG LOGLEV(4, 70, M_DEBUG)*/ /* show pthread de= bug information */ diff --git a/src/openvpn/error.c b/src/openvpn/error.c index dacfa8f..1b98235 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -175,7 +175,7 @@ { openvpn_exit(OPENVPN_EXIT_STATUS_CANNOT_OPEN_DEBUG_FILE); /* exit = point */ } -#else /* ifdef OPENVPN_DEBUG_COMMAND_LINE */ +#else msgfp =3D NULL; #endif } diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index c9d3389..a419e32 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -266,7 +266,7 @@ return IP_PMTUDISC_DONT; } msg(M_FATAL, "invalid --mtu-disc type: '%s' -- valid types are 'yes', = 'maybe', or 'no'", name); -#else /* if defined(IP_PMTUDISC_DONT) && defined(IP_PMTUDISC_WANT) && defi= ned(IP_PMTUDISC_DO) */ +#else msg(M_FATAL, MTUDISC_NOT_SUPPORTED_MSG); #endif return -1; /* NOTREACHED */ diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 8b352e9..e1ce32a 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1006,9 +1006,7 @@ #ifdef PACKET_TRUNCATION_CHECK { - status_printf( - so, - "HEADER,ERRORS,Common Name,TUN Read Trunc,TUN Write Trunc,= Pre-encrypt Trunc,Post-decrypt Trunc"); + status_printf(so, "HEADER,ERRORS,Common Name,TUN Read Trunc,TU= N Write Trunc,Pre-encrypt Trunc,Post-decrypt Trunc"); hash_iterator_init(m->hash, &hi); while ((he =3D hash_iterator_next(&hi))) { diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index dc5c93f..c2a93e8 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -208,7 +208,7 @@ uint8_t ntlmv2_hmacmd5[16]; uint8_t *ntlmv2_blob =3D ntlmv2_response + 16; /* inside ntlmv2_respon= se, length: 128 */ int ntlmv2_blob_size =3D 0; - int phase3_bufpos =3D 0x40; /* offset to next security buffer data to = be added */ + int phase3_bufpos =3D 0x40; /* offset to next secur= ity buffer data to be added */ size_t len; char domain[128]; diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c index f1e1f76..64b4f8c 100644 --- a/src/openvpn/openvpn.c +++ b/src/openvpn/openvpn.c @@ -160,9 +160,7 @@ struct context c; #if PEDANTIC - fprintf( - stderr, - "Sorry, I was built with --enable-pedantic and I am incapable of d= oing any real work!\n"); + fprintf(stderr, "Sorry, I was built with --enable-pedantic and I am in= capable of doing any real work!\n"); return 1; #endif diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 672b954..c54032d 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3931,7 +3931,8 @@ * Check file/directory sanity * */ -#ifndef ENABLE_SMALL /* Expect people using the stripped down version to k= now what they do */ +/* Expect people using the stripped down version to know what they do */ +#ifndef ENABLE_SMALL #define CHKACC_FILE (1 << 0) /**< Check for a file/directory presenc= e */ #define CHKACC_DIRPATH (1 << 1) /**< Check for directory presence where= a file should reside */ @@ -6243,7 +6244,7 @@ print_default_gateway(M_INFO, &rgi, &rgi6); openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */ } -#endif /* if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) */ +#endif else if (streq(p[0], "echo") || streq(p[0], "parameter")) { struct buffer string =3D alloc_buf_gc(OPTION_PARM_SIZE, &gc); diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 51468dd..38e67c8 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -133,16 +133,16 @@ int tls_mtu; /* Maximum MTU for the control channel messages= */ /* Advanced MTU negotiation and datagram fragmentation options */ - int mtu_discover_type; /* used if OS supports setting Path MTU discove= ry options on socket */ + int mtu_discover_type; /* used if OS supports setting Path MT= U discovery options on socket */ - int fragment; /* internal fragmentation size */ - bool fragment_encap; /* true if --fragment had the "mtu" parameter to - * include overhead from IP and TCP/UDP encapsu= lation */ - int mssfix; /* Upper bound on TCP MSS */ - bool mssfix_default; /* true if --mssfix should use the default para= meters */ - bool mssfix_encap; /* true if --mssfix had the "mtu" parameter to = include - * overhead from IP and TCP/UDP encapsulation */ - bool mssfix_fixed; /* use the mssfix value without any encapsulati= on adjustments */ + int fragment; /* internal fragmentation size */ + bool fragment_encap; /* true if --fragment had the "mtu" pa= rameter to + * include overhead from IP and TCP/UD= P encapsulation */ + int mssfix; /* Upper bound on TCP MSS */ + bool mssfix_default; /* true if --mssfix should use the def= ault parameters */ + bool mssfix_encap; /* true if --mssfix had the "mtu" para= meter to include + * overhead from IP and TCP/UDP encaps= ulation */ + bool mssfix_fixed; /* use the mssfix value without any en= capsulation adjustments */ int explicit_exit_notification; /* Explicitly tell peer when we are ex= iting via OCC_EXIT or [RESTART] message */ diff --git a/src/openvpn/options_util.c b/src/openvpn/options_util.c index 5251b21..c3938a7 100644 --- a/src/openvpn/options_util.c +++ b/src/openvpn/options_util.c @@ -146,14 +146,14 @@ return (int)i; } -static const char *updatable_options[] =3D { "block-ipv6", "block-o= utside-dns", - "dhcp-option", "dns", - "ifconfig", "ifconfig-= ipv6", +static const char *updatable_options[] =3D { "block-ipv6", "block-outside-= dns", + "dhcp-option", "dns", + "ifconfig", "ifconfig-ipv6", "push-continuation", "redirect-= gateway", - "redirect-private", "route", - "route-gateway", "route-ipv= 6", - "route-metric", "topology", - "tun-mtu", "keepalive= " }; + "redirect-private", "route", + "route-gateway", "route-ipv6", + "route-metric", "topology", + "tun-mtu", "keepalive" }; bool check_push_update_option_flags(char *line, int *i, unsigned int *flags) diff --git a/src/openvpn/run_command.h b/src/openvpn/run_command.h index 4b74f22..afd1b88 100644 --- a/src/openvpn/run_command.h +++ b/src/openvpn/run_command.h @@ -27,12 +27,15 @@ #include "env_set.h" /* Script security */ -#define SSEC_NONE 0 /* strictly no calling of external programs */ -#define SSEC_BUILT_IN 1 /* only call built-in programs such as ifconfig, r= oute, netsh, etc.*/ -#define SSEC_SCRIPTS 2 /* allow calling of built-in programs and user-def= ined scripts */ -#define SSEC_PW_ENV = \ - 3 /* allow calling of built-in programs and user-defined scripts that = may receive a password \ - as an environmental variable */ +/** strictly no calling of external programs */ +#define SSEC_NONE 0 +/** only call built-in programs such as ifconfig, route, netsh, etc.*/ +#define SSEC_BUILT_IN 1 +/** allow calling of built-in programs and user-defined scripts */ +#define SSEC_SCRIPTS 2 +/** allow calling of built-in programs and user-defined scripts that may r= eceive a password + as an environmental variable */ +#define SSEC_PW_ENV 3 #define OPENVPN_EXECVE_ERROR -1 /* generic error while forking to r= un an external program */ #define OPENVPN_EXECVE_NOT_ALLOWED -2 /* external program not run due to = script security */ diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index cd5293a..e8fde86 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -222,15 +222,15 @@ */ uint32_t peer_id; - struct key_state_ssl ks_ssl; /* contains SSL object and BIOs for the c= ontrol channel */ + struct key_state_ssl ks_ssl; /* contains SSL object and BIOs= for the control channel */ - time_t initial; /* when we created this session */ - time_t established; /* when our state went S_ACTIVE */ - time_t must_negotiate; /* key negotiation times out if not finis= hed before this time */ - time_t must_die; /* this object is destroyed at this time = */ - time_t peer_last_packet; /* Last time we received a packet in this= control session */ + time_t initial; /* when we created this session= */ + time_t established; /* when our state went S_ACTIVE= */ + time_t must_negotiate; /* key negotiation times out if= not finished before this time */ + time_t must_die; /* this object is destroyed at = this time */ + time_t peer_last_packet; /* Last time we received a pack= et in this control session */ - int initial_opcode; /* our initial P_ opcode */ + int initial_opcode; /* our initial P_ opcode */ struct session_id session_id_remote; /* peer's random session ID */ struct link_socket_actual remote_addr; /* peer's IP addr */ @@ -579,9 +579,8 @@ enum multi_status { CAS_NOT_CONNECTED, - CAS_WAITING_AUTH, /**< Initial TLS connection established but deferred= auth is not yet finished - */ - CAS_PENDING, /**< Options import (Connect script/plugin, ccd,...)= */ + CAS_WAITING_AUTH, /**< Initial TLS connection established = but deferred auth is not yet finished */ + CAS_PENDING, /**< Options import (Connect script/plug= in, ccd,...) */ CAS_PENDING_DEFERRED, /**< Waiting on an async option import h= andler */ CAS_PENDING_DEFERRED_PARTIAL, /**< at least handler succeeded but anot= her is still pending */ CAS_FAILED, /**< Option import failed or explicitly = denied the client */ diff --git a/src/openvpn/xkey_helper.c b/src/openvpn/xkey_helper.c index f4a9948..3820808 100644 --- a/src/openvpn/xkey_helper.c +++ b/src/openvpn/xkey_helper.c @@ -329,10 +329,12 @@ #define MAKE_DI(x) { NID_##x, x, sizeof(x) } + /* clang-format off */ DIG_INFO dinfo[] =3D { MAKE_DI(sha1), MAKE_DI(sha256), MAKE_DI(sha384), MAKE_DI= (sha512), MAKE_DI(sha224), MAKE_DI(sha512_224), MAKE_DI(sha512_256), { 0, NU= LL, 0 } }; + /* clang-format on */ size_t out_len =3D 0; bool ret =3D false; diff --git a/src/tapctl/tap.c b/src/tapctl/tap.c index 09be7e8..b633e77 100644 --- a/src/tapctl/tap.c +++ b/src/tapctl/tap.c @@ -225,10 +225,8 @@ delete_device(_In_ HDEVINFO hDeviceInfoSet, _In_ PSP_DEVINFO_DATA pDeviceI= nfoData, _Inout_ LPBOOL pbRebootRequired) { - SP_REMOVEDEVICE_PARAMS params =3D - { - .ClassInstallHeader =3D - { + SP_REMOVEDEVICE_PARAMS params =3D { + .ClassInstallHeader =3D { .cbSize =3D sizeof(SP_CLASSINSTALL_HEADER), .InstallFunction =3D DIF_REMOVE, }, @@ -281,10 +279,8 @@ change_device_state(_In_ HDEVINFO hDeviceInfoSet, _In_ PSP_DEVINFO_DATA pD= eviceInfoData, _In_ BOOL bEnable, _Inout_ LPBOOL pbRebootRequired) { - SP_PROPCHANGE_PARAMS params =3D - { - .ClassInstallHeader =3D - { + SP_PROPCHANGE_PARAMS params =3D { + .ClassInstallHeader =3D { .cbSize =3D sizeof(SP_CLASSINSTALL_HEADER), .InstallFunction =3D DIF_PROPERTYCHANGE, }, @@ -768,10 +764,8 @@ if (dwResult !=3D ERROR_SUCCESS) { /* The adapter was installed. But, the adapter ID was unobtainable= . Clean-up. */ - SP_REMOVEDEVICE_PARAMS removedevice_params =3D - { - .ClassInstallHeader =3D - { + SP_REMOVEDEVICE_PARAMS removedevice_params =3D { + .ClassInstallHeader =3D { .cbSize =3D sizeof(SP_CLASSINSTALL_HEADER), .InstallFunction =3D DIF_REMOVE, }, diff --git a/tests/unit_tests/openvpn/test_pkt.c b/tests/unit_tests/openvpn= /test_pkt.c index 3823d39..65b31e7 100644 --- a/tests/unit_tests/openvpn/test_pkt.c +++ b/tests/unit_tests/openvpn/test_pkt.c @@ -219,7 +219,7 @@ { buf_reset_len(&buf); buf_write(&buf, client_reset_v2_tls_crypt, sizeof(client_reset_v2_= tls_crypt)); - BPTR(&buf)[i] =3D 0x23; + (BPTR(&buf))[i] =3D 0x23; verdict =3D tls_pre_decrypt_lite(&tas, &state, &from, &buf); assert_int_equal(verdict, VERDICT_INVALID); free_tls_pre_decrypt_state(&state); @@ -274,7 +274,7 @@ free_tls_pre_decrypt_state(&state); /* flip a byte in the hmac */ - BPTR(&buf)[20] =3D 0x23; + (BPTR(&buf))[20] =3D 0x23; verdict =3D tls_pre_decrypt_lite(&tas, &state, &from, &buf); assert_int_equal(verdict, VERDICT_INVALID); free_tls_pre_decrypt_state(&state); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1129?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ibd900adfc775b7f785f1d5630184a124f5d8ff4b Gerrit-Change-Number: 1129 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: cron2 Gerrit-MessageType: newpatchset --NoUlyBN5ZqI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2.

cron2 uploaded patch set #3 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outd= ated and were removed: Code-Review+2 by cron2

clang-format: Switch to ColumnLimit 0

In some= cases an actual ColumnLimit leads to unfortunate
formatting. So leave t= he decision to developers after all.

This commit contains:
- cha= nges that clang-format did as reaction to the config
change
- man= ual cleanups of these changes
- manual cleanup of some previous changes= done
with ColumnLimit 100

Change-Id: Ibd900adfc775b7f785f1d56= 30184a124f5d8ff4b
Signed-off-by: Frank Lichtenheld <frank@...2641...&= gt;
Acked-by: Gert Doering <gert@...1296...>
Message-Id: <20= 250805132706.27619-1-gert@...1296...>
URL: https://www.mail-archive.c= om/openvpn-devel@lists.sourceforge.net/msg32523.html
Signed-off-by: Gert= Doering <gert@...1296...>
---
M .clang-format
M sample/samp= le-plugins/client-connect/sample-client-connect.c
M sample/sample-plugin= s/log/log_v3.c
M sample/sample-plugins/simple/base64.c
M src/openvpn/= crypto_openssl.c
M src/openvpn/errlevel.h
M src/openvpn/error.c
M = src/openvpn/mtu.c
M src/openvpn/multi.c
M src/openvpn/ntlm.c
M src= /openvpn/openvpn.c
M src/openvpn/options.c
M src/openvpn/options.hM src/openvpn/options_util.c
M src/openvpn/run_command.h
M src/openv= pn/ssl_common.h
M src/openvpn/xkey_helper.c
M src/tapctl/tap.c
M t= ests/unit_tests/openvpn/test_pkt.c
19 files changed, 149 insertions(+), = 152 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn =
refs/changes/29/1129/3
diff --git a/.clang-format b/.clang-format
index c314fca..1cce4c3 100644
--- a/.clang-f= ormat
+++ b/.clang-format
@@ -24,7 +24,7 @@=
BreakBeforeBraces: Allman
BreakBeforeTer= naryOperators: true
BreakStringLiterals: false
<= span style=3D"color: hsl(0, 100%, 40%);">-ColumnLimit: '100'
=
+ColumnLimit: '0'
ContinuationIndentWidth: '4'
Deriv= ePointerAlignment: false
IndentCaseLabels: true
= diff --git a/sample/sample-plugins/client-connect/sample-client-conne= ct.c b/sample/sample-plugins/client-connect/sample-client-connect.c<= br>index 7e3b5a9..eaa07d2 100644
--- a/sample/sample-= plugins/client-connect/sample-client-connect.c
+++ b/sample= /sample-plugins/client-connect/sample-client-connect.c
@@ -= 128,9 +128,8 @@
/* Check API compatibility -- struct v= ersion 5 or higher needed */
if (v3structver < 5)
{
-= fprintf(
- = stderr,
- = "sample-client-connect: this plugin is incompatible with the runn= ing version of OpenVPN\n");
+ fprintf(stderr,
+ "sample-client-connect: this plugin i= s incompatible with the running version of OpenVPN\n");
return OPENVPN_PLUGIN_FUNC_ERROR;

}<= br>
diff --git a/sample/sample-plugins/log/log_v3.c = b/sample/sample-plugins/log/log_v3.c
index cef22cf..1b43947= 100644
--- a/sample/sample-plugins/log/log_v3.c
= +++ b/sample/sample-plugins/log/log_v3.c
@@ -80,8 +80= ,7 @@
/* Check that we are API compatible */ if (v3structver !=3D OPENVPN_PLUGINv3_STRUCTVER)
{

- print= f(
- "l= og_v3: ** ERROR ** Incompatible plug-in interface between this plug-in and = OpenVPN\n");
+ = printf("log_v3: ** ERROR ** Incompatible plug-in interface betwe= en this plug-in and OpenVPN\n");
return OPENV= PN_PLUGIN_FUNC_ERROR;
}

diff --git a/sample/sample-plugins/simple/base64.c b/sample/sample-plug= ins/simple/base64.c
index 8a1dedd..8ca0888 100644--- a/sample/sample-plugins/simple/base64.c
+++ b/sa= mple/sample-plugins/simple/base64.c
@@ -104,8 +104,7 @@
/* Check that we are API compatible */
= if (v3structver !=3D OPENVPN_PLUGINv3_STRUCTVER)
{<= /span>
- printf(=
- "base64.c: = ** ERROR ** Incompatible plug-in interface between this plug-in and OpenVPN= \n");
+ p= rintf("base64.c: ** ERROR ** Incompatible plug-in interface between th= is plug-in and OpenVPN\n");
return OPENVPN_PL= UGIN_FUNC_ERROR;
}

d= iff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index cfea3eb..4fb6393 100644
--- a/src/openvp= n/crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c
@@ -1046,11 +1046,16 @@
* this translation tab= le for forward lookup, only for returning the name
* with= md_kt_name() */
const cipher_name_pair digest_name_transl= ation_table[] =3D {
- = { "BLAKE2s256", "BLAKE2S-256" }, { "BLAKE2b512&= quot;, "BLAKE2B-512" },
- { "RIPEMD160", "RIPEMD-160" }, { &qu= ot;SHA224", "SHA2-224" },
- { "SHA256", "SHA2-256" }, = { "SHA384", "SHA2-384" },
- { "SHA512", "SHA2-512" },= { "SHA512-224", "SHA2-512/224" },
- { "SHA512-256", &quo= t;SHA2-512/256" }, { "SHAKE128", "SHAKE-128" },
+ { "BLAKE2s256= ", "BLAKE2S-256" },
+ { "BLAKE2b512", "BLAKE2B-512" },
+ { "RIPEMD160&q= uot;, "RIPEMD-160" },
+ { "SHA224", "SHA2-224" },
+ { "SHA256", "S= HA2-256" },

+ = { "SHA384", "SHA2-384" },
+ { "SHA512", "SHA2-512" }= ,
+ { "SHA512= -224", "SHA2-512/224" },
+ { "SHA512-256", "SHA2-512/256" = },
+ { "SHAKE= 128", "SHAKE-128" },
{ "SHAKE256&q= uot;, "SHAKE-256" },
};
const s= ize_t digest_name_translation_table_count =3D
diff --git a/= src/openvpn/errlevel.h b/src/openvpn/errlevel.h
index 2d33d= 55..f1ae8c5 100644
--- a/src/openvpn/errlevel.h
<= span>+++ b/src/openvpn/errlevel.h

@@ -49,73 +49,73 @@
* of output.
*/

= -#define M_VERB0 LOGLEV(0, 0, 0) = /* Messages displayed even at --verb 0 (fatal errors only) */
+#define M_VERB0 LOGLEV(0, 0, 0) = /* Messages displayed even at --verb 0 (fatal errors onl= y) */


-#define M_INFO LOGLEV(1, 0, 0) /* default informational messages */
+#define M_INFO LOGLEV(1,= 0, 0) /* default informational messages */
=
-#define D_LINK= _ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors from main event lo= op */
-#define D_CRYPT_= ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from encrypt/decrypt */
-#define D_TLS_ERRORS = LOGLEV(1, 3, M_NONFATAL) /* show TLS control channel errors */-#define D_RESOLVE_ERRORS LOGLEV= (1, 4, M_NONFATAL) /* show hostname resolve errors */
-#define D_COMP_ERRORS LOGLEV(1, 5, M_NO= NFATAL) /* show compression errors */
-#define D_REPLAY_ERRORS LOGLEV(1, 6, M_NONFATAL) /* show= packet replay errors */
-#d= efine D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /* show server import opti= on errors */
-#define D= _MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* show multi-client server error= s */
-#define D_EVENT_E= RRORS LOGLEV(1, 10, M_NONFATAL) /* show event.[ch] errors */
-#define D_PUSH_ERRORS LOGLEV(1,= 11, M_NONFATAL) /* show push/pull errors */

-#define D_PID_PERSIST LOGLEV(1, 12, M_NONFATAL) /= * show packet_id persist errors */
-#define D_FRAG_ERRORS LOGLEV(1, 13, M_NONFATAL) /* show fra= gmentation errors */
-#= define D_ALIGN_ERRORS LOGLEV(1, 14, M_NONFATAL) /* show bad struct alignm= ents */
+#define D_LI= NK_ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors from main event= loop */
+#define D_C= RYPT_ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from encrypt/decryp= t */
+#define D_TLS_E= RRORS LOGLEV(1, 3, M_NONFATAL) /* show TLS control channel errors */<= /span>
+#define D_RESOLVE_ER= RORS LOGLEV(1, 4, M_NONFATAL) /* show hostname resolve errors */+#define D_COMP_ERRORS LOG= LEV(1, 5, M_NONFATAL) /* show compression errors */
+#define D_REPLAY_ERRORS LOGLEV(1, 6, M_N= ONFATAL) /* show packet replay errors */
+#define D_STREAM_ERRORS LOGLEV(1, 7, M_NONFATAL) = /* TCP stream error requiring restart */
+#define D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /*= show server import option errors */
+#define D_MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* sho= w multi-client server errors */
+#define D_EVENT_ERRORS LOGLEV(1, 10, M_NONFATAL) /* show eve= nt.[ch] errors */
+#d= efine D_PUSH_ERRORS LOGLEV(1, 11, M_NONFATAL) /* show push/pull errors = */
+#define D_PID_PER= SIST LOGLEV(1, 12, M_NONFATAL) /* show packet_id persist errors */
+#define D_FRAG_ERRORS = LOGLEV(1, 13, M_NONFATAL) /* show fragmentation errors */
+#define D_ALIGN_ERRORS LOGLEV(1, = 14, M_NONFATAL) /* show bad struct alignments */

<= br>-#define D_HANDSHAKE LOGLEV(2,= 20, 0) /* show data & control channel handshakes */
-#define D_CLOSE LOGLEV= (2, 22, 0) /* show socket and TUN/TAP close */
-#define D_PROXY LOGLEV(2, 24, 0)= /* show http proxy control packets */

-#define D_ARGV LOGLEV(2, 25, 0) = /* show struct argv errors */
+#define D_HANDSHAKE LOGLEV(2, 20, 0) /* sh= ow data & control channel handshakes */
+#define D_CLOSE LOGLEV(2, 22, 0) = /* show socket and TUN/TAP close */
+#define D_PROXY LOGLEV(2, 24, 0) /* sho= w http proxy control packets */
+#define D_ARGV LOGLEV(2, 25, 0) /* show str= uct argv errors */

-#define D_TLS_DEBUG_LOW LOGLEV(3, 20, 0) /* low freque= ncy info from tls_session routines */
-#define D_GREMLIN LOGLEV(3, 30, 0) /* show simu= lated outage info from gremlin module */
-#define D_GENKEY LOGLEV(3, 31, 0) /* print = message after key generation */
-#define D_ROUTE LOGLEV(3, 0, 0) /* show routes add= ed and deleted (don't mute) */
-#define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debuggi= ng info from TUN/TAP driver */
-#define D_RESTART LOGLEV(3, 33, 0) /* show certain res= tart messages */
-#defi= ne D_PUSH LOGLEV(3, 34, 0) /* show push/pull info */<= br>-#define D_IFCONFIG_POOL LOGLE= V(3, 35, 0) /* show ifconfig pool info */
-#define D_AUTH LOGLEV(3, 37, 0) /*= show user/pass auth info */
-#define D_MULTI_LOW LOGLEV(3, 38, 0) /* show point-to-mult= ipoint low-freq debug info */
-#define D_PLUGIN LOGLEV(3, 39, 0) /* show plugin calls= */
-#define D_MANAGEME= NT LOGLEV(3, 40, 0) /* show --management info */
-#define D_SCHED_EXIT LOGLEV(3, 41, 0= ) /* show arming of scheduled exit */
-#define D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* sho= w route quota exceeded messages */
-#define D_OSBUF LOGLEV(3, 43, 0) /* show socket/= tun/tap buffer sizes */
-#define D_PS_PROXY LOGLEV(3, 44, 0) /* messages related to --p= ort-share option */
-#d= efine D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info (don'= ;t mute) */
-#define D_= DCO LOGLEV(3, 0, 0) /* show DCO related messages */=
+#define D_TLS_DEBUG_LOW LO= GLEV(3, 20, 0) /* low frequency info from tls_session routines *= /
+#define D_GREMLIN = LOGLEV(3, 30, 0) /* show simulated outage info from gremli= n module */
+#define = D_GENKEY LOGLEV(3, 31, 0) /* print message after key gene= ration */
+#define D_= ROUTE LOGLEV(3, 0, 0) /* show routes added and deleted = (don't mute) */
+= #define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debugging info = from TUN/TAP driver */
+#def= ine D_PUSH LOGLEV(3, 34, 0) /* show push/pull info */
+#define D_IFCONFIG_PO= OL LOGLEV(3, 35, 0) /* show ifconfig pool info */
+#define D_AUTH LOGLEV(3, = 37, 0) /* show user/pass auth info */

+#define D_MULTI_LOW LOGLEV(3, 38, 0) = /* show point-to-multipoint low-freq debug info */
+#define D_PLUGIN LOGLEV(3, 39, = 0) /* show plugin calls */
+#define D_MANAGEMENT LOGLEV(3, 40, 0) /* sh= ow --management info */
+#define D_SCHED_EXIT LOGLEV(3, 41, 0) /* show arming of s= cheduled exit */
+#de= fine D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* show route quota exceed= ed messages */
+#defi= ne D_OSBUF LOGLEV(3, 43, 0) /* show socket/tun/tap buffe= r sizes */
+#define D= _PS_PROXY LOGLEV(3, 44, 0) /* messages related to --port-sh= are option */
+#defin= e D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info (don= 9;t mute) */
+#define= D_DCO LOGLEV(3, 0, 0) /* show DCO related messages *= /

-#d= efine D_SHOW_PARMS LOGLEV(4, 50, 0) /* show all parameters on prog= ram initiation */
-#def= ine D_LOW LOGLEV(4, 52, 0) /* miscellaneous low-frequency d= ebug info */
-#define D= _DHCP_OPT LOGLEV(4, 53, 0) /* show DHCP options binary string */=
-#define D_MBUF = LOGLEV(4, 54, 0) /* mbuf.[ch] routines */
-#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) = /* PACKET_TRUNCATION_CHECK */
-#define D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-mu= ltipoint packet drops */
-#def= ine D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track attributes on= connection */
-#define= D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequency init messa= ges */
-#define D_MTU_I= NFO LOGLEV(4, 61, 0) /* show terse MTU info */
-#define D_PID_DEBUG_LOW LOGLEV(4, 63= , 0) /* show low-freq packet-id debugging info */
-#define D_PID_DEBUG_MEDIUM LOGLEV(4, 64, 0)= /* show medium-freq packet-id debugging info */
-#define D_CIPHER_INIT LOGLEV(4, 65, 0)= /* show messages about cipher init */
+#define D_SHOW_PARMS LOGLEV(4, 50, 0) /= * show all parameters on program initiation */
+#define D_LOW LOGLEV(4, 52, 0) = /* miscellaneous low-frequency debug info */
+#define D_DHCP_OPT LOGLEV(4, 53, 0) = /* show DHCP options binary string */
+#define D_MBUF LOGLEV(4, 54, 0) = /* mbuf.[ch] routines */
+#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) /* PACKET_TRUNCAT= ION_CHECK */
+#define= D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-multipoint pa= cket drops */
+#defin= e D_MULTI_MEDIUM LOGLEV(4, 58, 0) /* show medium frequency mult= i messages */
+#defin= e D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track attributes= on connection */
+#d= efine D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequency = init messages */
+#de= fine D_MTU_INFO LOGLEV(4, 61, 0) /* show terse MTU info */<= /span>
+#define D_PID_DEBUG_= LOW LOGLEV(4, 63, 0) /* show low-freq packet-id debugging info *= /
+#define D_PID_DEBU= G_MEDIUM LOGLEV(4, 64, 0) /* show medium-freq packet-id debugging i= nfo */
+#define D_CIP= HER_INIT LOGLEV(4, 65, 0) /* show messages about cipher init *= /

-#d= efine D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W= ' to stdout for read/write */
+#define D_LOG_RW LOGLEV(5, 0, 0) /* Print = 'R' or 'W' to stdout for read/write */

-#define D_RTNL = LOGLEV(6, 68, M_DEBUG) /* show RTNL low level operations */
-#define D_LINK_RW LOGLEV(6, 69,= M_DEBUG) /* show TCP/UDP reads/writes (terse) */
-#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) = /* show TUN/TAP reads/writes */
-#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show TAP-Window= s driver debug info */
= -#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show client NAT debug in= fo */
-#define D_XKEY = LOGLEV(6, 69, M_DEBUG) /* show xkey-provider debug info */-#define D_DCO_DEBUG LOGLEV= (6, 69, M_DEBUG) /* show DCO related lowlevel debug messages */
<= span style=3D"color: hsl(0, 100%, 40%);">-#define D_SIGNAL_DEBUG LOGLEV(6,= 69, M_DEBUG) /* show signal related debug messages */
+#define D_RTNL LOGLEV(6, 68, M_= DEBUG) /* show RTNL low level operations */
+#define D_LINK_RW LOGLEV(6, 69, M_DEBUG)= /* show TCP/UDP reads/writes (terse) */
+#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) = /* show TUN/TAP reads/writes */
+#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show = TAP-Windows driver debug info */
+#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show cl= ient NAT debug info */
+#def= ine D_DCO_DEBUG LOGLEV(6, 69, M_DEBUG) /* show DCO related lowleve= l debug messages */
+= #define D_SIGNAL_DEBUG LOGLEV(6, 69, M_DEBUG) /* show signal related = debug messages */

#define D_SHOW_KEYS = LOGLEV(7, 70, M_DEBUG) /* show data channel encryption keys */

#define D_SHOW_KEY_SOURCE LOGLEV(7, 70, M_DEBUG) /* show dat= a channel key source entropy */
@@ -150,32 +150,32 @@
#define D_SHOW_OCC LOGLEV(7, 74, M_DEBUG) /* show opt= ions compatibility string */


= -#define D_VLAN_DEBUG LOGLEV(7, 7= 4, M_DEBUG) /* show VLAN tagging/untagging debug info */
<= span style=3D"color: hsl(120, 100%, 40%);">+#define D_VLAN_DEBUG LOGLEV(7, = 74, M_DEBUG) /* show VLAN tagging/untagging debug info */

-#define D= _HANDSHAKE_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show detailed description of h= andshake */
-#define D_= TLS_DEBUG_MED LOGLEV(8, 70, M_DEBUG) /* limited info from tls_session r= outines */
-#define D_I= NTERVAL LOGLEV(8, 70, M_DEBUG) /* show interval.h debugging info *= /
-#define D_SCHEDULER = LOGLEV(8, 70, M_DEBUG) /* show scheduler debugging info */-#define D_GREMLIN_VERBOSE LO= GLEV(8, 70, M_DEBUG) /* show verbose info from gremlin module */
= -#define D_REL_DEBUG LOGL= EV(8, 70, M_DEBUG) /* show detailed info from reliable routines */-#define D_EVENT_WAIT LO= GLEV(8, 70, M_DEBUG) /* show detailed info from event waits */
-#define D_MULTI_TCP LOGLEV= (8, 70, M_DEBUG) /* show debug info from mtcp.c */

+#define D_HANDSHAKE_VERBOSE LOGLEV(8, 70, M_= DEBUG) /* show detailed description of handshake */
+#define D_TLS_DEBUG_MED LOGLEV(8, = 70, M_DEBUG) /* limited info from tls_session routines */
+#define D_INTERVAL LOGL= EV(8, 70, M_DEBUG) /* show interval.h debugging info */
+#define D_SCHEDULER LOGLEV= (8, 70, M_DEBUG) /* show scheduler debugging info */
+#define D_GREMLIN_VERBOSE LOGLEV(8,= 70, M_DEBUG) /* show verbose info from gremlin module */
+#define D_REL_DEBUG LOGL= EV(8, 70, M_DEBUG) /* show detailed info from reliable routines */
+#define D_EVENT_WAIT = LOGLEV(8, 70, M_DEBUG) /* show detailed info from event waits */<= /span>
+#define D_MULTI_TCP = LOGLEV(8, 70, M_DEBUG) /* show debug info from mtcp.c */

-#define D= _TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed info from TLS ro= utines */
-#define D_CO= MP LOGLEV(9, 70, M_DEBUG) /* show compression info */-#define D_READ_WRITE LO= GLEV(9, 70, M_DEBUG) /* show all tun/tcp/udp reads/writes/opens */-#define D_PACKET_CONTENT LO= GLEV(9, 70, M_DEBUG) /* show before/after encryption packet content */

-#define D_TLS_NO_SEND_KEY = LOGLEV(9, 70, M_DEBUG) /* show when no data channel send-key exists */

-#define D_PID_PERSIST_DE= BUG LOGLEV(9, 70, M_DEBUG) /* show packet-id persist debugging info */
-#define D_LINK_RW_VERBOSE = LOGLEV(9, 70, M_DEBUG) /* increase link reads/writes verbosity */<= br>-#define D_STREAM_DEBUG L= OGLEV(9, 70, M_DEBUG) /* show TCP stream debug info */
-#define D_WIN32_IO LOGLEV(9, 70, = M_DEBUG) /* win32 I/O debugging info */
-#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) /* sho= w PKCS#11 debugging */
+#define D_COMP LOGLEV(9, 70, M_DEBUG) /* show comp= ression info */
+#def= ine D_READ_WRITE LOGLEV(9, 70, M_DEBUG) /* show all tun/tcp/udp= reads/writes/opens */
+#define D_TLS_NO_SEND_KEY LOGLEV(9, 70, M_DEBUG) /* sh= ow when no data channel send-key exists */
+#define D_PID_PERSIST_DEBUG LOGLEV(9, 70, M_DEBUG) = /* show packet-id persist debugging info */
+#define D_LINK_RW_VERBOSE LOGLEV(9, 70, M_DEB= UG) /* increase link reads/writes verbosity */
+#define D_STREAM_DEBUG LOGLEV(9, 70,= M_DEBUG) /* show TCP stream debug info */
+#define D_WIN32_IO LOGLEV(9, 70, M_DEB= UG) /* win32 I/O debugging info */
+#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) = /* show PKCS#11 debugging */

-#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) = /* show traffic shaper info */
+#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) /* sho= w traffic shaper info */

-#define D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* = win32 registry debugging info */
-#define D_OPENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenS= SL locks */
+#define = D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* win32 registry debugging= info */
+#define D_O= PENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenSSL locks */

/*#define D_THREAD_DEBUG LOGLEV(4, 70, = M_DEBUG)*/ /* show pthread debug information */
diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index dacfa8f..1b98235 100644

--- a/src/openvpn/error.c<= /span>
+++ b/src/openvpn/error.c
@@ -175,7 +175,7 = @@
{
openvpn_exit(OPENVPN_EXI= T_STATUS_CANNOT_OPEN_DEBUG_FILE); /* exit point */
}
-#else /* ifdef OPENVPN_= DEBUG_COMMAND_LINE */
+#else
msgfp =3D NULL;
#endif=
}
diff --git a/src/openvpn/mtu.c b/src/openvpn/m= tu.c
index c9d3389..a419e32 100644
--- a/sr= c/openvpn/mtu.c
+++ b/src/openvpn/mtu.c
@@ = -266,7 +266,7 @@
return IP_PMTUDISC_DONT; }
msg(M_FATAL, "invalid --mtu-disc t= ype: '%s' -- valid types are 'yes', 'maybe', or = 9;no'", name);
-#else /* if defined(IP_PMTUDISC_DONT) && defined(IP_PMTUDISC_WANT= ) && defined(IP_PMTUDISC_DO) */
+#else
msg(M_FATAL, MTUDISC_NOT_SUP= PORTED_MSG);
#endif
return -1; /* NOT= REACHED */
diff --git a/src/openvpn/multi.c b/src/openvpn/m= ulti.c
index 8b352e9..e1ce32a 100644
--- a/= src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -1006,9 +1006,7 @@


#ifdef PACKET_T= RUNCATION_CHECK
{
- status_printf(
- so,
- "HEADER,ERRORS,Common Name,TUN= Read Trunc,TUN Write Trunc,Pre-encrypt Trunc,Post-decrypt Trunc");
+ status_pri= ntf(so, "HEADER,ERRORS,Common Name,TUN Read Trunc,TUN Write Trunc,Pre-= encrypt Trunc,Post-decrypt Trunc");
hash_= iterator_init(m->hash, &hi);
while ((he= =3D hash_iterator_next(&hi)))
{diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c
index dc5c93f..c2a93e8 100644

--- a/src/openvpn/ntlm.c
+++ b/src/openvpn/ntlm.c
@@ -208,7 +208,7 @@
uint8_t ntlmv2_hmacmd5[16];
uint8_= t *ntlmv2_blob =3D ntlmv2_response + 16; /* inside ntlmv2_response, length:= 128 */
int ntlmv2_blob_size =3D 0;
- int phase3_bufpos =3D 0x40; /* offse= t to next security buffer data to be added */
+ int phase3_bufpos =3D 0x40; = /* offset to next security buffer data to be added */
= size_t len;

char domain[128];
diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c
index f1e1f76..64b4f8c 100644
--- a/src/openvpn= /openvpn.c
+++ b/src/openvpn/openvpn.c
@@ -= 160,9 +160,7 @@
struct context c;

#if PEDANTIC
- fprintf(
- = stderr,
- &= quot;Sorry, I was built with --enable-pedantic and I am incapable of doing = any real work!\n");
+ fprintf(stderr, "Sorry, I was built with --enable-pedantic an= d I am incapable of doing any real work!\n");
ret= urn 1;
#endif

diff --git= a/src/openvpn/options.c b/src/openvpn/options.c
index 672b= 954..c54032d 100644
--- a/src/openvpn/options.c
<= span>+++ b/src/openvpn/options.c

@@ -3931,7 +3931,8 @@
* Check file/directory sanity
*
= */
-#ifndef ENA= BLE_SMALL /* Expect people using the stripped down version to know what the= y do */
+/* Expect pe= ople using the stripped down version to know what they do */
+#ifndef ENABLE_SMALL


#define CHKACC_FILE (1 << 0) /**< Chec= k for a file/directory presence */
#define CHKACC_DIRPATH = (1 << 1) /**< Check for directory presence where a file should = reside */
@@ -6243,7 +6244,7 @@
pr= int_default_gateway(M_INFO, &rgi, &rgi6);
= openvpn_exit(OPENVPN_EXIT_STATUS_GOOD); /* exit point */
= }
-#endif /* if defi= ned(ENABLE_DEBUG) && !defined(ENABLE_SMALL) */
+#endif
else if (str= eq(p[0], "echo") || streq(p[0], "parameter")) {
struct buffer string =3D alloc_buf_g= c(OPTION_PARM_SIZE, &gc);
diff --git a/src/openvpn/opti= ons.h b/src/openvpn/options.h
index 51468dd..38e67c8 100644=
--- a/src/openvpn/options.h
+++ b/src/open= vpn/options.h
@@ -133,16 +133,16 @@
in= t tls_mtu; /* Maximum MTU for the control channel messages */

/* Advanced MTU negotiation and datagra= m fragmentation options */
- int mtu_discover_type; /* used if OS supports setting Path MTU dis= covery options on socket */
+ int mtu_discover_type; /* used if OS supports setting = Path MTU discovery options on socket */

- int fragment; /* internal = fragmentation size */
-= bool fragment_encap; /* true if --fragment had the "mtu" pa= rameter to
- = * include overhead from IP and TCP/UDP encapsulation */
- int mssfix; = /* Upper bound on TCP MSS */
- bool mssfix_default; /* true if --mssfix should use the def= ault parameters */
- = bool mssfix_encap; /* true if --mssfix had the "mtu" paramet= er to include
- = * overhead from IP and TCP/UDP encapsulation */<= br>- bool mssfix_fixed; /*= use the mssfix value without any encapsulation adjustments */
+ int fragment; = /* internal fragmentation size */

+ bool fragment_encap; /* true if --fragment= had the "mtu" parameter to
+ * include overhead f= rom IP and TCP/UDP encapsulation */
+ int mssfix; /* Upper bound on TCP M= SS */
+ bool mssfi= x_default; /* true if --mssfix should use the default parameters= */
+ bool mssfix_= encap; /* true if --mssfix had the "mtu" parameter t= o include
+ = * overhead from IP and TCP/UDP encapsulation */<= /span>
+ bool mssfix_fixe= d; /* use the mssfix value without any encapsulation adjustmen= ts */

int explicit_exit_notification= ; /* Explicitly tell peer when we are exiting via OCC_EXIT or
[RESTART] message */

<= span>diff --git a/src/openvpn/options_util.c b/src/openvpn/options_util.c
index 5251b21..c3938a7 100644
--- a/src/open= vpn/options_util.c
+++ b/src/openvpn/options_util.c<= br>@@ -146,14 +146,14 @@
return (int)i; }

-static const char *updatable_options[] =3D { "block-ipv6",= "block-outside-dns",
- "dhcp-opti= on", "dns",
- "ifconfig",= "ifconfig-ipv6",
+static const char *updatable_options[] =3D { "block-i= pv6", "block-outside-dns",
+ "dhcp= -option", "dns",
+ "ifconfig"= , "ifconfig-ipv6",
= "push-continuation", "redirect-gateway",<= /span>
- = "redirect-private", "route",
- = "route-gateway", "route-ipv6",
- = "route-metric", "topology",
- = "tun-mtu", "keepalive" };
+ = "redirect-private", "route",
+ = "route-gateway", "route-ipv6",=
+ = "route-metric", "topology",
= + = "tun-mtu", "keepalive" };
=
bool
check_push_update_option_flags(cha= r *line, int *i, unsigned int *flags)
diff --git a/src/open= vpn/run_command.h b/src/openvpn/run_command.h
index 4b74f22= ..afd1b88 100644
--- a/src/openvpn/run_command.h
= +++ b/src/openvpn/run_command.h
@@ -27,12 +27,15 @@
#include "env_set.h"

= /* Script security */
-#define SSEC_NONE 0 /* strictly no calling of external programs = */
-#define SSEC_BUILT_= IN 1 /* only call built-in programs such as ifconfig, route, netsh, etc.*/<= /span>
-#define SSEC_SCRIPTS = 2 /* allow calling of built-in programs and user-defined scripts */<= br>-#define SSEC_PW_ENV = \
- 3 /* allow calling of b= uilt-in programs and user-defined scripts that may receive a password \
- as an environmen= tal variable */
+/** = strictly no calling of external programs */
+#define SSEC_NONE 0
+/** only call built-in programs such as ifconfi= g, route, netsh, etc.*/
+#define SSEC_BUILT_IN 1
+/** allow calling of built-in programs and user-defined scripts */<= /span>
+#define SSEC_SCRIPTS= 2
+/** allow callin= g of built-in programs and user-defined scripts that may receive a password=
+ as an environme= ntal variable */
+#de= fine SSEC_PW_ENV 3

#define OPENVPN_EXE= CVE_ERROR -1 /* generic error while forking to run an external progr= am */
#define OPENVPN_EXECVE_NOT_ALLOWED -2 /* external p= rogram not run due to script security */
diff --git a/src/o= penvpn/ssl_common.h b/src/openvpn/ssl_common.h
index cd5293= a..e8fde86 100644
--- a/src/openvpn/ssl_common.h
= +++ b/src/openvpn/ssl_common.h
@@ -222,15 +222,15 @@<= /span>
*/
uint32_t peer_id;
<= span>

- struct key_= state_ssl ks_ssl; /* contains SSL object and BIOs for the control channel *= /
+ struct key_sta= te_ssl ks_ssl; /* contains SSL object and BIOs for the control ch= annel */

- time_t initial; /* when we created this session */
- time_t established; = /* when our state went S_ACTIVE */
- time_t must_negotiate; /* key negotiation t= imes out if not finished before this time */
- time_t must_die; /* this object is d= estroyed at this time */
+ time_t initial; /* when we created this sessio= n */
+ time_t esta= blished; /* when our state went S_ACTIVE */
+ time_t must_negotiate; = /* key negotiation times out if not finished before this time */=

+ time_t must_die= ; /* this object is destroyed at this time */<= br>+ time_t peer_last_packet= ; /* Last time we received a packet in this control session *= /

- = int initial_opcode; /* our initial P_ opcode */
+ int initial_opcode; = /* our initial P_ opcode */
struct session_id s= ession_id_remote; /* peer's random session ID */
= struct link_socket_actual remote_addr; /* peer's IP addr */
=
@@ -579,9 +579,8 @@
enum multi_sta= tus
{
CAS_NOT_CONNECTED,
- CAS_WAITING_AUTH, /**< Init= ial TLS connection established but deferred auth is not yet finished
=
- */
- CAS_PENDING, /*= *< Options import (Connect script/plugin, ccd,...) */
+ CAS_WAITING_AUTH, /**&= lt; Initial TLS connection established but deferred auth is not yet finishe= d */
+ CAS_PENDING= , /**< Options import (Connect script/plugin, ccd,...) = */
CAS_PENDING_DEFERRED, /**< Waiting on an= async option import handler */
CAS_PENDING_DEFERRED_P= ARTIAL, /**< at least handler succeeded but another is still pending */<= /span>
CAS_FAILED, /**< Option import fa= iled or explicitly denied the client */
diff --git a/src/op= envpn/xkey_helper.c b/src/openvpn/xkey_helper.c
index f4a99= 48..3820808 100644
--- a/src/openvpn/xkey_helper.c+++ b/src/openvpn/xkey_helper.c
@@ -329,10 +329,12 = @@

#define MAKE_DI(x) { NID_##x, x, size= of(x) }

+ /* clang-format off */
DIG_INFO dinfo[] =3D = {
MAKE_DI(sha1), MAKE_DI(sha256), MAKE_DI(sh= a384), MAKE_DI(sha512),
MAKE_DI(sha224), MAKE_= DI(sha512_224), MAKE_DI(sha512_256), { 0, NULL, 0 }
};=
+ /* clang-format= on */

size_t out_len =3D 0;<= br> bool ret =3D false;
diff --git a/src/tapctl/t= ap.c b/src/tapctl/tap.c
index 09be7e8..b633e77 100644
--- a/src/tapctl/tap.c
+++ b/src/tapctl/tap.c
@@ -225,10 +225,8 @@
delete_device(_In_ HDEV= INFO hDeviceInfoSet, _In_ PSP_DEVINFO_DATA pDeviceInfoData,
_Inout_ LPBOOL pbRebootRequired)

{<= br>- SP_REMOVEDEVICE_PARAMS pa= rams =3D
- {<= br>- .ClassInstallHeader = =3D
- {+ SP_REMOVEDEVICE_PARAMS p= arams =3D {
+ = .ClassInstallHeader =3D {
.cbSize =3D sizeof(S= P_CLASSINSTALL_HEADER),
.InstallFunction =3D D= IF_REMOVE,
},
@@ -281,10 +279,8 @@=
change_device_state(_In_ HDEVINFO hDeviceInfoSet, _In_ PS= P_DEVINFO_DATA pDeviceInfoData,
_In_ B= OOL bEnable, _Inout_ LPBOOL pbRebootRequired)
{
= - SP_PROPCHANGE_PARAMS params = =3D
- {
- .ClassInstallHeader =3D
- {
+ SP_PROPCHANGE_PARAMS params = =3D {

+ .Class= InstallHeader =3D {
.cbSize =3D sizeof(SP_CLAS= SINSTALL_HEADER),
.InstallFunction =3D DIF_PRO= PERTYCHANGE,
},
@@ -768,10 +764,8 = @@
if (dwResult !=3D ERROR_SUCCESS)
= {
/* The adapter was installed. But, the adapte= r ID was unobtainable. Clean-up. */
- SP_REMOVEDEVICE_PARAMS removedevice_params =3D=
- {
- .ClassInstallHeader =3D
- {
+ SP_REMOVEDEVICE_PARAMS r= emovedevice_params =3D {

+ .ClassInstallHeader =3D {
= .cbSize =3D sizeof(SP_CLASSINSTALL_HEADER),
= .InstallFunction =3D DIF_REMOVE,
},<= br>diff --git a/tests/unit_tests/openvpn/test_pkt.c b/tests/unit_test= s/openvpn/test_pkt.c
index 3823d39..65b31e7 100644--- a/tests/unit_tests/openvpn/test_pkt.c
+++ b/tes= ts/unit_tests/openvpn/test_pkt.c
@@ -219,7 +219,7 @@=
{
buf_reset_len(&buf); buf_write(&buf, client_reset_v2_tls_crypt, sizeof(clie= nt_reset_v2_tls_crypt));
+ (BPTR(&buf))[i] =3D 0x23;
= verdict =3D tls_pre_decrypt_lite(&tas, &state, &from, &a= mp;buf);
assert_int_equal(verdict, VERDICT_INVALID= );
free_tls_pre_decrypt_state(&state);<= br>@@ -274,7 +274,7 @@
free_tls_pre_decrypt_stat= e(&state);

/* flip a byte in the= hmac */
- BPTR(&= ;buf)[20] =3D 0x23;
+= (BPTR(&buf))[20] =3D 0x23;
verdict =3D tls_pre= _decrypt_lite(&tas, &state, &from, &buf);
= assert_int_equal(verdict, VERDICT_INVALID);
free_t= ls_pre_decrypt_state(&state);

To vi= ew, visit change 1129. To unsubscribe, or for help writing mail filters, visit = settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibd900adfc775b7f785f1d563018= 4a124f5d8ff4b
Gerrit-Change-Number: 1129
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-MessageType: newpatchset
--NoUlyBN5ZqI=--