From nobody Fri Sep 22 19:07:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RshcG3SjLz4vHGs; Fri, 22 Sep 2023 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RshcG2vWMz4g0l; Fri, 22 Sep 2023 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695409678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBaf1sGtXmQlZCgl2IWSZieSkPGVGUm75R7SrL0w6AU=; b=GjI2WEZ7hAmHWjjCOnOlrJYCDFyoHXYj6CzWcPEZQE/rLucTkKtP60cwavUhfzA8CuxT05 T0aJghN6bge4UFsZwv+C1UxDTYk9OQ3N/ZrxeGZadhpNBuExLGgsjouicXbWNZdHxrEojk YmOrUXKk8xF9pe7gtHN789Za29JETv0YcoHPIeUCbF/07LzpZvnCzKc81PWN/sM/U/oiqI qnIiyrwjMCgMI2k/NQIGvEvewFPg3t58Fx4tqejhkJklzxHBMXTsPyE6crsNLRgoEQzDpf 6UpYfrbu7yrN2kTp3Bh0iMOuKB4MvN11H9Mljy7q9duf9bgVyjq5uPnhqEUjeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695409678; a=rsa-sha256; cv=none; b=g4zb5vnIJE54wcxGArB3JkKUXDlDVl9bZGr3iIY8dCqZgsGK4wh7hFK/nWYHrlGA6goo5a IvrJZ23Kqh+lZfyFsUl+mjEeSRXwU3QMDYmJvHdQBT+3Ql7ybYzuBXN03PMpYxf6tSO7W8 eTNuE7TGSbeWxok1UsI7FiH/IaO5DH5jMdcpIMki4fs3s0Mw9QkQvOWxe7Gm5FsNirZXjf Z0KRSFqXSmgcjEt2TqjuxuIACB1ySjUHnhBZPa9pPJyeRLT/dX77CjzIvY3xHlay2+sk9z JMLJX2qJ5RAGEifqttk9ey5GChvfM86RVRnbPCTuHAJwz1n4jBLqlFntWJ5DOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695409678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBaf1sGtXmQlZCgl2IWSZieSkPGVGUm75R7SrL0w6AU=; b=Q9rir9FiTXg6N2zGQZRifWgDnfAWXKtbcIu5K4x3d3fpT3rRmMgRMS4t5D2rJ1dBI1boW+ deOBl4fVT49/FIVq9K9qtcY7C95Y9TC1vtZPQYPQA2l9/0Pz2eK4fzD5r7rhQJeCdq3ntk nYuQbB9+RjdYFzjJzp4V2fv6oyp383j6BWZtwSMzqC7CStrsZPY1BEhLO33j789iX7MIdu seKI/50d0Y/W0Ma716BXUQ1hDuqLvI0a/QLkyiJWL/uvHqRblW65vSO8ZGMxtc3lkEe5EM cyyAxRW/vk+TN6JkvpgrADmtqz7VvXpTGOd3il1Q15tvTTtohiPmoToFrqGBCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RshcG1yQSzYvk; Fri, 22 Sep 2023 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MJ7wmu065878; Fri, 22 Sep 2023 19:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MJ7w1Y065875; Fri, 22 Sep 2023 19:07:58 GMT (envelope-from git) Date: Fri, 22 Sep 2023 19:07:58 GMT Message-Id: <202309221907.38MJ7w1Y065875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e99406a2bb32 - stable/14 - OpenSSL: Fix handling of the "0:" label in arm-xlate.pl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e99406a2bb3234e2a05eef5e63be3054ffac3371 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e99406a2bb3234e2a05eef5e63be3054ffac3371 commit e99406a2bb3234e2a05eef5e63be3054ffac3371 Author: Tom Cosgrove AuthorDate: 2023-08-29 21:38:11 +0000 Commit: Ed Maste CommitDate: 2023-09-22 19:06:35 +0000 OpenSSL: Fix handling of the "0:" label in arm-xlate.pl When $label == "0", $label is not truthy, so `if ($label)` thinks there isn't a label. Correct this by looking at the result of the s/// command. Verified that there are no changes in the .S files created during a normal build, and that the "0:" labels appear in the translation given in the error report (and they are the only difference in the before and after output). Obtained from: OpenSSL commit 9607f5ccf285ac9988a86f95c5ad9f92b556a843 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41587 (cherry picked from commit eba6abafc1988dc8753b08822abff333d4810e75) --- crypto/openssl/crypto/perlasm/arm-xlate.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/openssl/crypto/perlasm/arm-xlate.pl b/crypto/openssl/crypto/perlasm/arm-xlate.pl index a90885905c0f..57b75c4e5dad 100755 --- a/crypto/openssl/crypto/perlasm/arm-xlate.pl +++ b/crypto/openssl/crypto/perlasm/arm-xlate.pl @@ -159,9 +159,8 @@ while(my $line=<>) { } { - $line =~ s|(^[\.\w]+)\:\s*||; - my $label = $1; - if ($label) { + if ($line =~ s|(^[\.\w]+)\:\s*||) { + my $label = $1; printf "%s:",($GLOBALS{$label} or $label); } }