From patchwork Thu Apr 16 01:39:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1082 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id yGEMFTpEmF5YKQAAIUCqbw for ; Thu, 16 Apr 2020 07:40:42 -0400 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id GHTrFDpEmF4jVgAAovjBpQ ; Thu, 16 Apr 2020 07:40:42 -0400 Received: from smtp14.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net with LMTP id qD9eFDpEmF7FbAAAfawv4w ; Thu, 16 Apr 2020 07:40:42 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp14.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 18f81a96-7fd7-11ea-bd50-525400504bae-1-1 Received: from [216.105.38.7] ([216.105.38.7:34358] helo=lists.sourceforge.net) by smtp14.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4E/D5-24206-834489E5; Thu, 16 Apr 2020 07:40:40 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jP2s6-0001Z2-EV; Thu, 16 Apr 2020 11:39:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jP2s4-0001Yi-8c for openvpn-devel@lists.sourceforge.net; Thu, 16 Apr 2020 11:39:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=POW8CQCWOUaPuW6X0neCbFn9hoFPje69sV0q88ENtbg=; b=W0X28PqN6FUHMckPAL7+xOfh4p C1ftS53Q7D9EZFl5uXZNJNOdno4pVN4MCb6nIgxtHLHXo/2vUh+bFZouNSbZjaUWx+eAq1HRlSEF9 PD4thuS0NhxOuF9OCA9Ka9EJYjklDuAfKkkZdJYSJlXvOZIKyldeDjdvLSN/CGFN3mJg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=POW8CQCWOUaPuW6X0neCbFn9hoFPje69sV0q88ENtbg=; b=H9VCQ7hbdG3xYqU6tSEoiGHug1 K8W3MlwYtfODgSejuXrAV0/O7/hyn7eB1qzotDkDQwPxame0L4+lJSmGtXCIGzDpp2LkvVTOXn2wO qFvzG6Qgi64boDzSdQRtCbz3qEzes0fp+u0DK22frHz2HkHryRkXrTVu8aWVnxa6FI9k=; Received: from [192.26.174.232] (helo=mail.blinkt.de) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jP2ry-0009hw-O0 for openvpn-devel@lists.sourceforge.net; Thu, 16 Apr 2020 11:39:51 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.92.3 (FreeBSD)) (envelope-from ) id 1jP2ri-000D1D-94 for openvpn-devel@lists.sourceforge.net; Thu, 16 Apr 2020 13:39:30 +0200 Received: (nullmailer pid 15240 invoked by uid 10006); Thu, 16 Apr 2020 11:39:30 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 16 Apr 2020 13:39:29 +0200 Message-Id: <20200416113930.15192-2-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200416113930.15192-1-arne@rfc2549.org> References: <20200416113930.15192-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 RDNS_NONE Delivered to internal network by a host with no rDNS -0.5 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jP2ry-0009hw-O0 Subject: [Openvpn-devel] [PATCH v2 2/3] Minor style change to improve code style X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox These are small manual changes that are done to improve the code style and also make the result of uncrustify better without mixing manual changes/automatic changes into a single commit. - Make prototype and function identical for gc_addspecial. Also fixes uncrustify misparsing the embedded function pointer decleration - Disallow uncrustify to reformat link_socket_init_phase1, which it messes up - Format the the parameters of a call of mbedtls_ssl_tls_prf to be more inline with the rest of our function calls with multiple arguments Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/buffer.c | 2 +- src/openvpn/socket.h | 4 +++- src/openvpn/ssl_mbedtls.c | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 8575e295..b32bc8b2 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -474,7 +474,7 @@ x_gc_freespecial(struct gc_arena *a) } void -gc_addspecial(void *addr, void (free_function)(void *), struct gc_arena *a) +gc_addspecial(void *addr, void (*free_function)(void *), struct gc_arena *a) { ASSERT(a); struct gc_entry_special *e; diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index e95547d1..38e5138d 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -296,7 +296,8 @@ int openvpn_connect(socket_descriptor_t sd, /* * Initialize link_socket object. */ - +/* *INDENT-OFF* uncrustify misparses this function declarion because of + * embedded #if/#endif tell it to skip this section */ void link_socket_init_phase1(struct link_socket *sock, const char *local_host, @@ -327,6 +328,7 @@ link_socket_init_phase1(struct link_socket *sock, int mark, struct event_timeout *server_poll_timeout, unsigned int sockflags); +/* Reenable uncrustify *INDENT-ON* */ void link_socket_init_phase2(struct link_socket *sock, const struct frame *frame, diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 4f194ad7..d585111b 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -209,10 +209,10 @@ int mbedtls_ssl_export_keys_cb(void *p_expkey, const unsigned char *ms, memcpy(client_server_random + 32, server_random, 32); const size_t ms_len = sizeof(ks_ssl->ctx->session->master); - int ret = mbedtls_ssl_tls_prf( - tls_prf_type, ms, ms_len, session->opt->ekm_label, - client_server_random, sizeof(client_server_random), - ks_ssl->exported_key_material, session->opt->ekm_size); + int ret = mbedtls_ssl_tls_prf(tls_prf_type, ms, ms_len, + session->opt->ekm_label, client_server_random, + sizeof(client_server_random), ks_ssl->exported_key_material, + session->opt->ekm_size); if (!mbed_ok(ret)) {