From patchwork Wed Jul 24 09:46:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 814165 Delivered-To: patch@linaro.org Received: by 2002:adf:f288:0:b0:367:895a:4699 with SMTP id k8csp2675302wro; Wed, 24 Jul 2024 02:48:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7Ght5r+J75DW6ic3O0kQjVt4dVve6c6MwjCM1+iU58VORDWlKnVenAqr2M9NYdXBT//MWLiwVi36KVxT+NP15 X-Google-Smtp-Source: AGHT+IG4oWmcB+yEnDMN4dd/gXVnDk+DOTB4A2JcvTZGB4f2KUCnYnF0zHVTo5MrLAwHqcQNd4I3 X-Received: by 2002:a05:6122:8c9:b0:4f2:ebd9:8e12 with SMTP id 71dfb90a1353d-4f50667e582mr15915946e0c.5.1721814503526; Wed, 24 Jul 2024 02:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721814503; cv=none; d=google.com; s=arc-20160816; b=y8sOhhYssQhPjfuvDKPuJ8XEXNPzWM7Q0WsZGhXg3JQ6n+XbgHgnLRevH1JeLJvG11 RgTnf8mLlB6QMKTyLO+QWr2SPPNLldxOEbCDSP3A+bGIUHsNNfLw6QJ9DjRoU3OWkFzf qPKcrD/L/8AkvWNZLbbfF/LHCsHlNSbTLInoAPi+cDySWoNHSccHa9bsVmZyxgQVBiG7 eaScYDAkxcxQc3z42G+rwbBMh/9rtPOTfndLWVspx18gSSe/r6mrkDviZSSJ4Zw6jyqQ jVNSleGVnD4tOeDYPFa8Tjbe9L+hp+JWLRaP4TKYKPEhUPu0gkRSoNCKkuqI3HJGMt1x VA4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G0CX9vhks7yTdTQlTeKYR0RMQ0dL+1/ELcWrWZDB/wk=; fh=cOKUfxljBUXgIrIxJJtS6Fgcom6aHeGv5vVzLnZSVlE=; b=lCAUF7aJvqTLWw0JSOrttv/7P/KUj0pJWgQuMMdxxU4pTi4nM3PcyzkjVrgP1WHcYF 1TbzLJbwgIkZGgAYsCJy9HgtFcGAa7z1RHZ7A2ZrHhckDroiOeULaNRrWAJUvEEPFkZd ViT/PNyzm8GESP7Fg2Pwr9VXkW1nffzRu2HmOMj97v0sKr/sVZi0TCaLppukn/2HmcTY U8FU4OFQMNrxnoqsbTRFmgjKg/rx+LPimaMaWcqHaq+67HksjOcLnGXRiXxgjN9VID1y Vp/7KGUof2qixzlDyTxMLH8Rch2o4BcWcH+z37O3MRblpCA7y7nXCPUfgL5DtSsqFn5V +59A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ciq95VJ4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a19904ad40si1186529085a.234.2024.07.24.02.48.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Jul 2024 02:48:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ciq95VJ4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sWYbB-0001Rn-2Q; Wed, 24 Jul 2024 05:47:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sWYb8-0001RH-LB for qemu-devel@nongnu.org; Wed, 24 Jul 2024 05:47:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sWYb6-0003Mb-Uw for qemu-devel@nongnu.org; Wed, 24 Jul 2024 05:47:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721814468; 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=G0CX9vhks7yTdTQlTeKYR0RMQ0dL+1/ELcWrWZDB/wk=; b=Ciq95VJ4qfHONfjlTbpPFFivtlwQCMnFgELTebsfTgOx0L1tF6d3qPrOZtklsDUAPWoMKk relIsVBzlhW0MOEZPf8NGNpHxeu+z0ysGbc0GeYYZmEzU2sG0Oy2DInyTEiAysrBxEcLxF O9FRvKUKQBFa539CagraF6YRwb4DZVI= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-UwjJ4ygcNY6tNsGtTYdM6g-1; Wed, 24 Jul 2024 05:47:44 -0400 X-MC-Unique: UwjJ4ygcNY6tNsGtTYdM6g-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F17D81955D4F; Wed, 24 Jul 2024 09:47:42 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.141]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9ADD419560AA; Wed, 24 Jul 2024 09:47:31 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Laurent Vivier , Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Eric Blake , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hyman Huang Subject: [PULL 02/11] crypto: Restrict pkix_asn1_tab[] to crypto-tls-x509-helpers.c Date: Wed, 24 Jul 2024 10:46:57 +0100 Message-ID: <20240724094706.30396-3-berrange@redhat.com> In-Reply-To: <20240724094706.30396-1-berrange@redhat.com> References: <20240724094706.30396-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.133, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé pkix_asn1_tab[] is only accessed by crypto-tls-x509-helpers.c, rename pkix_asn1_tab.c as pkix_asn1_tab.c.inc and include it once. Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé [berrange: updated MAINTAINERS for changed filename] Signed-off-by: Daniel P. Berrangé --- MAINTAINERS | 2 +- tests/qtest/meson.build | 3 +-- tests/unit/crypto-tls-x509-helpers.c | 6 +++++- tests/unit/crypto-tls-x509-helpers.h | 3 --- tests/unit/meson.build | 6 +++--- tests/unit/{pkix_asn1_tab.c => pkix_asn1_tab.c.inc} | 5 +---- 6 files changed, 11 insertions(+), 14 deletions(-) rename tests/unit/{pkix_asn1_tab.c => pkix_asn1_tab.c.inc} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index dd01288992..73040829b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3484,7 +3484,7 @@ F: qapi/crypto.json F: tests/unit/test-crypto-* F: tests/bench/benchmark-crypto-* F: tests/unit/crypto-tls-* -F: tests/unit/pkix_asn1_tab.c +F: tests/unit/pkix_asn1_tab.c.inc F: qemu.sasl Coroutines diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ff9200f882..e7ab2a4312 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -322,8 +322,7 @@ if gnutls.found() migration_files += [files('../unit/crypto-tls-psk-helpers.c'), gnutls] if tasn1.found() - migration_files += [files('../unit/crypto-tls-x509-helpers.c', - '../unit/pkix_asn1_tab.c'), tasn1] + migration_files += [files('../unit/crypto-tls-x509-helpers.c'), tasn1] endif endif diff --git a/tests/unit/crypto-tls-x509-helpers.c b/tests/unit/crypto-tls-x509-helpers.c index e9937f60d8..3e74ec5b5d 100644 --- a/tests/unit/crypto-tls-x509-helpers.c +++ b/tests/unit/crypto-tls-x509-helpers.c @@ -20,15 +20,19 @@ #include "qemu/osdep.h" +#include + #include "crypto-tls-x509-helpers.h" #include "crypto/init.h" #include "qemu/sockets.h" +#include "pkix_asn1_tab.c.inc" + /* * This stores some static data that is needed when * encoding extensions in the x509 certs */ -asn1_node pkix_asn1; +static asn1_node pkix_asn1; /* * To avoid consuming random entropy to generate keys, diff --git a/tests/unit/crypto-tls-x509-helpers.h b/tests/unit/crypto-tls-x509-helpers.h index 247e7160eb..562c160653 100644 --- a/tests/unit/crypto-tls-x509-helpers.h +++ b/tests/unit/crypto-tls-x509-helpers.h @@ -23,7 +23,6 @@ #include #include -#include #define QCRYPTO_TLS_TEST_CLIENT_NAME "ACME QEMU Client" @@ -171,6 +170,4 @@ void test_tls_cleanup(const char *keyfile); }; \ test_tls_generate_cert(&varname, cavarname.crt) -extern const asn1_static_node pkix_asn1_tab[]; - #endif diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 26c109c968..490ab8182d 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -99,11 +99,11 @@ if have_block tasn1.found() and \ host_os != 'windows' tests += { - 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', + 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', tasn1, crypto, gnutls], - 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', 'crypto-tls-psk-helpers.c', + 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'crypto-tls-psk-helpers.c', tasn1, crypto, gnutls], - 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', + 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', tasn1, io, crypto, gnutls]} endif if pam.found() diff --git a/tests/unit/pkix_asn1_tab.c b/tests/unit/pkix_asn1_tab.c.inc similarity index 99% rename from tests/unit/pkix_asn1_tab.c rename to tests/unit/pkix_asn1_tab.c.inc index 89521408a1..fe29c4102a 100644 --- a/tests/unit/pkix_asn1_tab.c +++ b/tests/unit/pkix_asn1_tab.c.inc @@ -3,10 +3,7 @@ * and is under copyright of various GNUTLS contributors. */ -#include "qemu/osdep.h" -#include "crypto-tls-x509-helpers.h" - -const asn1_static_node pkix_asn1_tab[] = { +static const asn1_static_node pkix_asn1_tab[] = { {"PKIX1", 536875024, 0}, {0, 1073741836, 0}, {"id-ce", 1879048204, 0},