From patchwork Wed Jul 17 23:35:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 782 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id 2Dr0L6A9MF3GRwAAIUCqbw for ; Thu, 18 Jul 2019 05:36:32 -0400 Received: from proxy8.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id +Ni9L6A9MF1WLQAAIasKDg ; Thu, 18 Jul 2019 05:36:32 -0400 Received: from smtp34.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1c.rsapps.net with LMTP id iGV5L6A9MF29KQAAHz/atg ; Thu, 18 Jul 2019 05:36:32 -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: smtp34.gate.ord1c.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: 86a420c2-a93f-11e9-8147-545200247500-1-1 Received: from [216.105.38.7] ([216.105.38.7:52626] helo=lists.sourceforge.net) by smtp34.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 06/38-29355-0AD303D5; Thu, 18 Jul 2019 05:36:32 -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 1ho2op-0002Vb-G2; Thu, 18 Jul 2019 09:35:19 +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 1ho2oo-0002VU-I7 for openvpn-devel@lists.sourceforge.net; Thu, 18 Jul 2019 09:35:18 +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=V0cZ/bqd4dMZgDcPVgWRcQnw4AAkxmaeIDJDGCnoR0o=; b=QbPPE9GBk4gAXsayoXePvCbX9I ROGw00oQRND48EGkxTZmSlFb/mz9s+vFN947GVB12S4h/Hy0AuhQQgXKQ98MJaYAnP8ICImm45Rll yH5f47IlxJnlQegL8qtHWVdQCoiV7nvUVr4FTVMt1RhnEKxGnJguFT0oAK1rVvgnTmT4=; 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=V0cZ/bqd4dMZgDcPVgWRcQnw4AAkxmaeIDJDGCnoR0o=; b=J7eYzQn4vVCDj2os8TQlNNKyTY EFaTSe/8aOexrUWBWpriU4IgWhqxAhkY9Wf09OSLHYkZujSm4MwROFkaGM9Fy1xACENj6VNo1PqMx /aND2BPCA6EsP0DSImQ6wc54by5I7LhWhbSjW/EbsmZ9Ulnjq2vFMCkDdvTtmlAnOSyw=; Received: from mail-ed1-f67.google.com ([209.85.208.67]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1ho2om-006CM6-JI for openvpn-devel@lists.sourceforge.net; Thu, 18 Jul 2019 09:35:18 +0000 Received: by mail-ed1-f67.google.com with SMTP id w20so29551554edd.2 for ; Thu, 18 Jul 2019 02:35:16 -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=V0cZ/bqd4dMZgDcPVgWRcQnw4AAkxmaeIDJDGCnoR0o=; b=OYj9I/W6EysvlBw3qwpq3H+gLMbxw6OLW0VRpgCNljyfatALOMZ5HFIsfMh50QstxO 5bF5dfgGHIl5DaM5Zl97cJm/yB8nbQ6nbutlqFifhmcfJsDF9TqpKpyNlVUsG0QThpPi t0bU3lyhSU82j6/ydWUMDhIjD3csS3L5MIjMa8QoOX+84uoOPnoIO58CodkRAH04wWqj txDYjT2oZzv49c+Ws0U6idnCFkH297VeN6x9QsylE2Z/Sx0WcPUXqRKr4gNdtQuENYea C8FvZP1MU2I8r63SPAyBlQYkntwhLd/Nw1x6u42sh5mzaUheSgOYSTf6EbkbEPVXMxAq 0drg== 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=V0cZ/bqd4dMZgDcPVgWRcQnw4AAkxmaeIDJDGCnoR0o=; b=i/TEhGShmrRgSce/z0TD+EaAaCr0gnNvTCFqTI8vqaQ7ityYgAxAmc2FwVZpgjMJGj 2OS5PtKTgbZroh1Y+zGW6vB8oLRhpwYEQqmeVF/UskI5fLKh8LyugO1x/wh1TpswuVaU V9BWCiC9eRKsYC9SXyRVjNFnQX+Z4cO+UULbYGF0bvLqkHCE2+JQdde4IsYHqUuYUIel 4krPvmtV9uaE7FIIYxjyl4Gd7HzBMCz3yRy1JzlaCJ/EiccMUWbVmXfEaAP7lJwCdqPT p3r1PBgOnOs789cAnwAbo/daqFY1dN/CkTcYkA//k3RXw1a9BMpOEO4MahSm2orZQX2d kVbA== X-Gm-Message-State: APjAAAUToQuig0VV3ENscKydh1ku9m4Z4mm8g3sAOqgRF+HbVLXXI/F/ WaE15d7yzEx6Vzr95jVHmtVxYyXyO96Clw== X-Google-Smtp-Source: APXvYqzNLhwuhLx0g1F/6gnPj0sA8G9CloDnnKPmbF1Q2m3LO0fn6wcuJJXloQw3clBO2qZEakM+/A== X-Received: by 2002:a50:b6e6:: with SMTP id f35mr39507580ede.82.1563442509708; Thu, 18 Jul 2019 02:35:09 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id pv18sm5522817ejb.14.2019.07.18.02.35.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jul 2019 02:35:08 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 18 Jul 2019 12:35:03 +0300 Message-Id: <1563442503-11119-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 https://www.dnswl.org/, no trust [209.85.208.67 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.67 listed in wl.mailspike.net] 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: openvpn.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: 1ho2om-006CM6-JI Subject: [Openvpn-devel] [PATCH] crypto.c: fix Visual Studio build 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 Commit fb4e8ab added variable-length array which is C99 feature and is not supported by Visual Studio. This removes VLA and writes data directly into passed buffer. Signed-off-by: Lev Stipakov Acked-By: Arne Schwabe --- src/openvpn/crypto.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index 69877d1..8bf33e7 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -1895,14 +1895,18 @@ cleanup: bool generate_ephemeral_key(struct buffer *key, const char *key_name) { + const int len = BCAP(key); + msg(M_INFO, "Using random %s.", key_name); - uint8_t rand[BCAP(key)]; - if (!rand_bytes(rand, BCAP(key))) + + if (!rand_bytes(BEND(key), len)) { msg(M_WARN, "ERROR: could not generate random key"); return false; } - buf_write(key, rand, BCAP(key)); + + buf_inc_len(key, len); + return true; }