From patchwork Mon Oct 8 05:09:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 511 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id qADFDymCu1tCbAAAIUCqbw for ; Mon, 08 Oct 2018 12:13:29 -0400 Received: from proxy20.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id IMJjDymCu1t6WQAAIasKDg ; Mon, 08 Oct 2018 12:13:29 -0400 Received: from smtp23.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.ord1d.rsapps.net with LMTP id IC3qDimCu1vUZQAAsk8m8w ; Mon, 08 Oct 2018 12:13:29 -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: smtp23.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 1756fe78-cb15-11e8-8396-525400bfb165-1-1 Received: from [216.105.38.7] ([216.105.38.7:13331] helo=lists.sourceforge.net) by smtp23.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D2/E6-11520-8228BBB5; Mon, 08 Oct 2018 12:13:28 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g9Y8q-0002Yj-Nq; Mon, 08 Oct 2018 16:12:20 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g9Y8p-0002YZ-Nl for openvpn-devel@lists.sourceforge.net; Mon, 08 Oct 2018 16:12:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EbE/QXTNfzHwXqzrMjTBA+DZSL1F5l1tBSCG1FCWtaI=; b=FPw5x5V2cPN3F2AnIXs+7wDv6L OlvPHx/RANR2/g0yiVC2uUmD3pnA93D7CMTBiKcvQlq3FOVmTYbcty5uun9YwbTEbrOG9OOjwAhir ls7EHQsF7m9+CyMoy/Ie7fdMxq0bbo75sDGYGYS9/Uts4bk+6mGo8aQDmBj+AWnui+zU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=EbE/QXTNfzHwXqzrMjTBA+DZSL1F5l1tBSCG1FCWtaI=; b=GtQD6wHAPeq7o9Vloy3Qh9uU1f IkUDguIT5N/yQn10qbqlNnRMbGx5HHevX+ewl/YYbF5ivKRiytzi0BFyHhGv6KuUBl046xM0o49Pu fOlOdxZmXubPTHskvtvMiokFAuy4ChN9mTBHCB0+yUwpIgSybRI8Dev4YCsmp9PPMyVc=; Received: from mail-ed1-f66.google.com ([209.85.208.66]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g9Y8l-003Ju5-62 for openvpn-devel@lists.sourceforge.net; Mon, 08 Oct 2018 16:12:19 +0000 Received: by mail-ed1-f66.google.com with SMTP id c1-v6so18106246ede.5 for ; Mon, 08 Oct 2018 09:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=EbE/QXTNfzHwXqzrMjTBA+DZSL1F5l1tBSCG1FCWtaI=; b=cSBTosa5GRD8xhyrWj9DMUkylwmbxBdkVkC8AXnsynL5hAZTdYsejHZSyhnRGCdiqi Ddpm/Lqyxssen93uIrLCIZxzjBbnTa8i/YLFGnAW5AZO2E7JIa3/OqAAnRrsZO+YMEaT sv7Wv1oBLvV+niN7VZL260Z7gZ9+222lRlcE7l+BcOUQuEIoWgFzAWXbeVluNWrJVBAJ VqbAKez45j1JL+mOvPlSIaD1xYdLe+RGm6A0g/soa+5dsZfn/bzUdqzXEMzlYiUA8nMu U1qUI3xafJgNl7fo7DyXguNd+7ySWNMrpexXUVfvk+Pfoj7WuIwXu7yS9JbqLe9HkB9X tp8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=EbE/QXTNfzHwXqzrMjTBA+DZSL1F5l1tBSCG1FCWtaI=; b=lMUhNuSlel5z9uLPk/dd125i0p+TFv7I7XtLQakJVvnCL5Jwh+VvUxA6Nh5DYGnShw 59BqTXLXnjs6soOPhjH7UmVM4o7Wa8HlP3uFHO6M5wUWDMlAmbpSUwMvLWlTakeVVXad 5lJg4HHoKvLS2hyYxBCcEhIm5wT6XWak9fjIl7Aum2qqvKySWCifqsFlkO/c4FTEp26h n2RHmlnvyCHPKR3cqJCau5RXBzKGM6LVDQVRiMtQRFwEahcACwHc1rd8M3lsN4Ao03V5 YVr3jpWCFa5iLGdamhR73ahpHreqwIJoe9dQ5pn5XSM0299msP2IWcn2h3MeJOqBhHbf Uf1A== X-Gm-Message-State: ABuFfoi0Kpepth/rzalTelctE2igjXyvvRtv6+X80+/Ukt/KcTuz/CYm pC+upydlUS2Jcrfsb1hQfd1n3GsOzS0= X-Google-Smtp-Source: ACcGV62IHboKi3v5P8LnOPle2OAgJU9ftWMtP+52Ap0aB5N0taBYEfaGS+oJz48EAkwD6d6y0Wk2xQ== X-Received: by 2002:a50:b6cf:: with SMTP id f15-v6mr30702985ede.268.1539015128205; Mon, 08 Oct 2018 09:12:08 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id e21-v6sm4090609edb.22.2018.10.08.09.12.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Oct 2018 09:12:07 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Mon, 8 Oct 2018 19:09:10 +0300 Message-Id: <1539014950-21921-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g9Y8l-003Ju5-62 Subject: [Openvpn-devel] [PATCH] options.c: fix broken unary minus usage 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 From: Lev Stipakov In Visual Studio when unary minus is applied to unsigned, result is still unsigned. This means that when we use result as function formal parameter, we pass incorrect value. Fix by adding explicit cast to signed type. Since GCC doesn't complain (and users too :), it probably casts to signed automatically. Signed-off-by: Lev Stipakov --- src/openvpn/options.c | 2 +- src/openvpn/ssl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index e42029c..1927a32 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3509,7 +3509,7 @@ calc_options_string_link_mtu(const struct options *o, const struct frame *frame) struct key_type fake_kt; init_key_type(&fake_kt, o->ciphername, o->authname, o->keysize, true, false); - frame_add_to_extra_frame(&fake_frame, -(crypto_max_overhead())); + frame_add_to_extra_frame(&fake_frame, -(int)(crypto_max_overhead())); crypto_adjust_frame_parameters(&fake_frame, &fake_kt, o->replay, cipher_kt_mode_ofb_cfb(fake_kt.cipher)); frame_finalize(&fake_frame, o->ce.link_mtu_defined, o->ce.link_mtu, diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 315303b..18b1fbd 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1987,7 +1987,7 @@ tls_session_update_crypto_params(struct tls_session *session, } /* Update frame parameters: undo worst-case overhead, add actual overhead */ - frame_add_to_extra_frame(frame, -(crypto_max_overhead())); + frame_add_to_extra_frame(frame, -(int)(crypto_max_overhead())); crypto_adjust_frame_parameters(frame, &session->opt->key_type, options->replay, packet_id_long_form); frame_finalize(frame, options->ce.link_mtu_defined, options->ce.link_mtu,