From patchwork Tue Oct 13 12:46:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1381564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cloudbasesolutions.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C9b0g4nR7z9sRK for ; Tue, 13 Oct 2020 23:47:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C786874AB; Tue, 13 Oct 2020 12:47:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Is9r9TtICmE; Tue, 13 Oct 2020 12:47:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 294A786949; Tue, 13 Oct 2020 12:47:13 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1156BC0891; Tue, 13 Oct 2020 12:47:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5413AC0052 for ; Tue, 13 Oct 2020 12:47:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F2C887BFF for ; Tue, 13 Oct 2020 12:47:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lmgWzCJc0L8W for ; Tue, 13 Oct 2020 12:47:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id B91FF87BCF for ; Tue, 13 Oct 2020 12:47:09 +0000 (UTC) X-Originating-IP: 89.137.184.67 Received: from localhost.localdomain (unknown [89.137.184.67]) (Authenticated sender: aserdean@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A8D3260003; Tue, 13 Oct 2020 12:47:05 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Tue, 13 Oct 2020 15:46:55 +0300 Message-Id: <20201013124655.1408-1-aserdean@cloudbasesolutions.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH v2] windows: Bump OpenSSL version X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Switch from OpenSSL 1.0.2 to 1.1.1. `mkdir` does not support permission arguments on Windows. Create a wrapper for it that uses only the last argument and uses `-p` option. Signed-off-by: Alin Gabriel Serdean --- v2: Add more details in the commit message. --- appveyor.yml | 6 +++--- m4/ax_check_openssl.m4 | 2 +- utilities/ovs-pki.in | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 25c3f69fb..9debf1465 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,15 +15,15 @@ init: mkdir C:\openvswitch\driver - $source = "https://slproweb.com/download/Win64OpenSSL-1_0_2u.exe" + $source = "https://slproweb.com/download/Win64OpenSSL-1_1_1h.exe" - $destination = "C:\ovs-build-downloads\Win64OpenSSL-1_0_2u.exe" + $destination = "C:\ovs-build-downloads\Win64OpenSSL-1_1_1h.exe" Invoke-WebRequest $source -OutFile $destination cd C:\ovs-build-downloads - .\Win64OpenSSL-1_0_2u.exe /silent /verysilent /sp- /suppressmsgboxes + .\Win64OpenSSL-1_1_1h.exe /silent /verysilent /sp- /suppressmsgboxes Start-Sleep -s 30 diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 281d4dc65..37f983284 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ SSL_INCLUDES="-I$ssldir/include" SSL_LDFLAGS="-L$ssldir/lib" if test "$WIN32" = "yes"; then - SSL_LIBS="-lssleay32 -llibeay32" + SSL_LIBS="-llibssl -llibcrypto" SSL_DIR=/$(echo ${ssldir} | ${SED} -e 's/://') else SSL_LIBS="-lssl -lcrypto" diff --git a/utilities/ovs-pki.in b/utilities/ovs-pki.in index e0ba910f9..c846b69a1 100755 --- a/utilities/ovs-pki.in +++ b/utilities/ovs-pki.in @@ -57,6 +57,14 @@ FreeBSD|NetBSD|Darwin) ;; esac +case $(uname -s) in +MINGW*|MSYS*) + mkdir() { + command mkdir -p "${@: -1}" + } + ;; +esac + for option; do # This option-parsing mechanism borrowed from a Autoconf-generated # configure script under the following license: