From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.13278.1638547715504971637 for ; Fri, 03 Dec 2021 08:08:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HM9OH9v8; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638547714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GhgRmJkGLpNe32frixFuxG1/bC8xi0rliWghjvRzemk=; b=HM9OH9v81I5nPVCqUxBimy6FRVxVgsvdY9DxhfNp9muUIi5eMoyVkF0TKsHEAz2LFXg5P4 NXjfAMN43LK9fNmifAWqvDHO7i2AH80gQIW+efenJjDC1AjBrtYftR6Kh4qxggxRCnotFD JJ/DmJNDaIKxjXqV3Mu4yHR8ZW91xI0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-p_d00Y5tPeCQKJBpVMPGqw-1; Fri, 03 Dec 2021 11:08:31 -0500 X-MC-Unique: p_d00Y5tPeCQKJBpVMPGqw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 748CA1926DA1; Fri, 3 Dec 2021 16:08:29 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E9C360C13; Fri, 3 Dec 2021 16:08:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D0C0618003A0; Fri, 3 Dec 2021 17:07:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Guomin Jiang , Pawel Polawski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyu Lu , Gerd Hoffmann Subject: [PATCH 06/24] CryptoPkg/openssl: process_files.pl: provider headers Date: Fri, 3 Dec 2021 17:07:30 +0100 Message-Id: <20211203160748.866150-7-kraxel@redhat.com> In-Reply-To: <20211203160748.866150-1-kraxel@redhat.com> References: <20211203160748.866150-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Copy over provider include files. First, because some of them are generated too. And second that seems to be the easiest way to make gcc find them when '#include ' is used in the openssl source files. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/process_files.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl index e903263a7582..7ac7d80b16ff 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -413,6 +413,17 @@ for my $file (map { s/\.in//; $_ } glob($OPENSSL_PATH . "/include/*/*.h.in")) { or die "Cannot copy $file !"; } +my @hdrs = (); +push @hdrs, glob($OPENSSL_PATH . "/providers/common/include/prov/[a-z]*.h"); +push @hdrs, glob($OPENSSL_PATH . "/providers/implementations/include/prov/[a-z]*.h"); +for my $file (@hdrs) { + my $dest = $file; + $dest =~ s|.*/include/|../Include/|; + print "\n--> Duplicating $file into $dest ... "; + system("perl -pe 's/\\n/\\r\\n/' < $file > $dest") == 0 + or die "Cannot copy $file !"; +} + print "\nProcessing Files Done!\n"; exit(0); -- 2.33.1