From patchwork Fri Sep 21 16:25:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 973310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42GzVF37Cfz9s7T for ; Sat, 22 Sep 2018 02:25:40 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7ED268D4; Fri, 21 Sep 2018 16:25:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D2BCD22 for ; Fri, 21 Sep 2018 16:25:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 62C9642D for ; Fri, 21 Sep 2018 16:25:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77561306B660; Fri, 21 Sep 2018 16:25:33 +0000 (UTC) Received: from graphite.redhat.com (ovpn-204-69.brq.redhat.com [10.40.204.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C60188EA6; Fri, 21 Sep 2018 16:25:32 +0000 (UTC) From: Timothy Redaelli To: dev@openvswitch.org Date: Fri, 21 Sep 2018 18:25:22 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 21 Sep 2018 16:25:33 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [branch 2.9] dhparams: Fix .c file generation with OpenSSL >= 1.1.1-pre9 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Since OpenSSL upstream commit 201b305a2409 ("apps/dsaparam.c generates code that is intended to be pasted or included into an existing source file: the function is static, and the code doesn't include dsa.h. Match the generated C source style of dsaparam.") "openssl dhparam -C" generates the get_dh functions as static, but the functions are used inside stream-ssl.c and so the static keyword cannot be used. This commit removes the static keyword from the get_dh functions during dhparams.c file generation by restoring the current behaviour. Signed-off-by: Timothy Redaelli Signed-off-by: Ben Pfaff (cherry picked from commit dc041eae5019a936618c398a2a1d106f65604ccc) --- Backport notice: On OVS 2.9.x the dhparams.c file is generated each time at build time and generate-dhparams-c doesn't exists. This commit does the same thing, but by modifying dhparam.c generation on lib/automake.mk instead. This is needed to build OVS 2.9 with new OpenSSL versions since dhparams.c is not cached on OVS 2.9.x. --- lib/automake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/automake.mk b/lib/automake.mk index 8ecad1241..70461ec8c 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -438,7 +438,7 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ - | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ + | sed 's/^static DH/DH/; s/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ mv lib/dhparams.c.tmp lib/dhparams.c else lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c