From patchwork Thu May 2 09:56:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794107 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp153703wrr; Thu, 2 May 2024 02:57:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOTG2q23j+RgErebrwHA+oXs6Bo4ZkFLKOisZfZrfCpIJX+sisyQ3YofX9YZRjT0v0/59PGIU5Z5u+Yif2YtXT X-Google-Smtp-Source: AGHT+IH914TeHdAZMnHHCujRS9Xwn1OSNrya8WSiaNANdB8S1Widts0NZ2kC1NdWk9UoSPgu6xGk X-Received: by 2002:ad4:5b89:0:b0:6a0:b014:c8bb with SMTP id 9-20020ad45b89000000b006a0b014c8bbmr5568775qvp.19.1714643855547; Thu, 02 May 2024 02:57:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714643855; cv=none; d=google.com; s=arc-20160816; b=RWfhq4wyJhJBGL1Vzm3cNe/ZuYg5QdG+bbCjRwqFAQCUQeSCST/wZXbmcbeu5pYZGT lPcBxnGDdmThJCsn0fatvhKY00fgouaFzqjYhqDmjF4APtW8TB1pxaap3VXx12aOuEQ2 GDwP/0ZeHNh9Q8Qxo6GynYKuGR6DkTCQo3sFqYj0qnoPY+gSVsmsKyxuQz1YUl+QcUHl bs5PvAH7SXaJjPiL8gS7EeHiSPfrwMRBh8SINtFm11GjlEByqLqZOQHOYQTXJdKUp/uh lWMwLRcmEHdI3MD3AlB3jPthA1W0BP91CbyvyxQr7/WNOYAN/exlhlbSmyr2h5H06P37 k+sA== 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=f7qwGbQTjhjXahUTZWh0LtFO6xVuUCN4ooMRx2Zw77U=; fh=Dhpq/bjK0ChgMAY5mUf7XOR2DhtP3cS/r2w/r+nRC1I=; b=ezsiJE4IrhHEEYCXpeQ4A3L2F1KppNe8gdQjs9Wal9ZIeVnksfK8w1tk67VHZWUQJ+ sQPrH9Iln/qD0S47g2D6N8JaTEuCaCHAxMDdXkOBw147P8Q33l7NIR/JFehZX/6ryXQ1 Dx7JjeE1LPOBCPSOe2Q4tOw+FjN3nGdM8a2YxYWmZ+SfPqw3xJZGfNe/9ZJ7CYQEyscR O04H7+2DMleP9/LM9Hqmm9KO1C6upa0NZGY7Jv5GCVHgfwrkjCJ6VLACCGNCPQZ/gmF8 BRaB20bSQKkDWqzX/yX2lCoc6jCMGmdwUs5sYvyzCGy4bBVx8KYgCwX8jMz1Q3VNAvPS g+PA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=enkVHEcd; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id eq10-20020ad4596a000000b006a0c7f42125si578783qvb.58.2024.05.02.02.57.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2024 02:57:35 -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=@linaro.org header.s=google header.b=enkVHEcd; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2TBT-0000bl-90; Thu, 02 May 2024 05:56:59 -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 1s2TBO-0000b7-K2 for qemu-devel@nongnu.org; Thu, 02 May 2024 05:56:56 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2TBN-000174-3u for qemu-devel@nongnu.org; Thu, 02 May 2024 05:56:54 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-34da84cb755so1444604f8f.2 for ; Thu, 02 May 2024 02:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714643811; x=1715248611; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7qwGbQTjhjXahUTZWh0LtFO6xVuUCN4ooMRx2Zw77U=; b=enkVHEcd71DBDUJaHHAp+kjQg+TEXxw8hByTR4TVdP61drr4W6n0gkAOxGe4ltkSaQ rJ/z8CeHu6hhYy+p8JrceICqo4OStMGdSzMMZxgx7vbDhdtRlJBkr5dACIMpTl5w5vgL 3M0W8qyujmbwpWWaQ32Lfi2J5FavfKnK444jzKE2LasaW1G0wvZwuzQJBG0nYY3fzAQ0 JG9WKB8gzII1maJBpfDvdFaLS54DXnh+pAZiz7Cd+izR3UZaR7MhLEz2xJsmbKiPpHEI O9mrfXD5/GdbvA5Y2eClKSqypmkNvd0yJmwXdrV6M2UpGyR6tJbQqb6ohB7UmnrCZNcN 0mnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714643811; x=1715248611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f7qwGbQTjhjXahUTZWh0LtFO6xVuUCN4ooMRx2Zw77U=; b=lVA5ncFJCUAzB0ruHmYTSqlipSfEvY4A+GGy4gKKGLvlDmnUxFhiNc6QnXK0wDFF6M X+oBh4cg1bdQ8mUIlx+J56TRlGzYr4XezpNlTcJMwoVsJb6jTjzTNOpFqWwIwyYJwBwS gYgUy0EFl2JQn6ITRbmkS01VgUoN176FP6nG0Wt9DYMzGlMFHMWUivD6cMCpGFPQdD0X 6Rdd+nelYiwLiS1ru5oVUomeaOOnEhwzgh9qTw4VcUcGB5Iax0FRFLKG2sDO9+wQGyYr OZOQuaeuVftGNmeL1vFMdJgo6t5RzW16nFWNVIHxED7/Uc9kfCTk3ZaeApmGw17FgIAo aTEw== X-Gm-Message-State: AOJu0YyGbShHw6v7xpslBM+HijO1bgQ3cDXradDa+wYPvEFax26H8Ul1 mIAjAmO0ihq4VsomRVbNQV87vyM3+Ae3FvTPlLeHtXA9/tSuEzQ4cm5PEwE0RW1cn38y7RjigAb R X-Received: by 2002:adf:facf:0:b0:34d:a23c:cb4a with SMTP id a15-20020adffacf000000b0034da23ccb4amr1272261wrs.7.1714643811001; Thu, 02 May 2024 02:56:51 -0700 (PDT) Received: from m1x-phil.lan ([176.187.215.106]) by smtp.gmail.com with ESMTPSA id w15-20020a5d544f000000b0034db8184b41sm847863wrv.112.2024.05.02.02.56.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 02:56:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?M?= =?utf-8?q?arc-Andr=C3=A9_Lureau?= , Thomas Huth , Paolo Bonzini , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/3] crypto: Remove 'crypto-tls-x509-helpers.h' from crypto-tls-psk-helpers.c Date: Thu, 2 May 2024 11:56:40 +0200 Message-ID: <20240502095642.93368-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240502095642.93368-1-philmd@linaro.org> References: <20240502095642.93368-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 crypto-tls-psk-helpers.c doesn't access the declarations of "crypto-tls-x509-helpers.h", remove the include line to avoid when building with GNUTLS but without Libtasn1: In file included from tests/unit/crypto-tls-psk-helpers.c:23: tests/unit/crypto-tls-x509-helpers.h:26:10: fatal error: libtasn1.h: No such file or directory 26 | #include | ^~~~~~~~~~~~ compilation terminated. Fixes: e1a6dc91dd ("crypto: Implement TLS Pre-Shared Keys (PSK).") Suggested-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/unit/crypto-tls-psk-helpers.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/crypto-tls-psk-helpers.c b/tests/unit/crypto-tls-psk-helpers.c index c6cc740772..36527fd655 100644 --- a/tests/unit/crypto-tls-psk-helpers.c +++ b/tests/unit/crypto-tls-psk-helpers.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" -#include "crypto-tls-x509-helpers.h" #include "crypto-tls-psk-helpers.h" #include "qemu/sockets.h" From patchwork Thu May 2 09:56:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794106 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp153663wrr; Thu, 2 May 2024 02:57:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVPBGtdKnkX6n/K4V1+sgKW9uCpvGcttEJkpxq5YKiY47xCFAfwngjAWs3p/ml9IMawW9fcUg16jhdY6r8hVXwb X-Google-Smtp-Source: AGHT+IHadoIEhmbP02ZoyI2OI2Dgnh4BVkqhVLS8DcNre50b1vLhoW3qE1jQp26VOEI16vcXp3yF X-Received: by 2002:a05:690c:6312:b0:61a:bdc8:6c90 with SMTP id ho18-20020a05690c631200b0061abdc86c90mr5523541ywb.20.1714643846862; Thu, 02 May 2024 02:57:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714643846; cv=none; d=google.com; s=arc-20160816; b=rXlqemRniW5A6XYUi4WvjM2jlWhC1icBaHoWBvsvGT5LBmsdyzFdudJbJINSa2INqo JjBhWTZHsUPZWRdrDZl2vFW4zPBQq94XKF2IqOm1pM63qQ9Ag/D+phrXCzVz3+nJC9WK U+BYw5X1QxbrwBKXPC97VkPTJQ9Qo0aHZaIg1ds9eP7hjAkjqSpFMhW9ceo1UPl3yO4O aChR/pwuvwNzrMK4621Ep87xlTRu2BKWevSZCMqBxMfs+kXxpARObr/dpqTSEa85lOul XUxMso26kFrf3qWRGSaybJ2uPlnX6WKX7uEM5YTBEVRWyeMCLssfIEljo9IA+jWrTLPu 9A6A== 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=Hscm9KdbM1whIxlQwwTQ6xBil1LPfb+u+PB5hBKBEJA=; fh=Dhpq/bjK0ChgMAY5mUf7XOR2DhtP3cS/r2w/r+nRC1I=; b=DW0fMzMOWgfWhqrE9lL+Cv0A4+EbX4qKoEFa+dhKWJEiXr569SvXcwC9CtVQFpGnLP vk0jTrAslH9rwy/P9G483c+gkHitdkVIJc8q6Gx7gW8ITa7thT/oQaFVGeIqRZPLnsNr aPnp1Ysk1iVRms/s4lFSPmqSSvo/MbiRmWRC9lQT1nJBmPqbmtDjAZCcbCP5Kdlc2TJV c32q71lvMk/nSlp/omXePbK61ZhvMf8bVCty8iBciyzMqgJQxahUz3S8A22nUG1YcBWN bnvCiG7Z60oxxyyafhivSM3nB9gI1HnG62POE2y5r+1zldQJbSyAc7f+YM4AKEEEuMld FB1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YwufLK4f; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hc26-20020a05622a2a1a00b0043ae59d2679si547561qtb.778.2024.05.02.02.57.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2024 02:57:26 -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=@linaro.org header.s=google header.b=YwufLK4f; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2TBZ-0000dk-F5; Thu, 02 May 2024 05:57:05 -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 1s2TBV-0000ci-78 for qemu-devel@nongnu.org; Thu, 02 May 2024 05:57:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2TBS-00017U-Fp for qemu-devel@nongnu.org; Thu, 02 May 2024 05:57:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-34db6a29a1eso1359488f8f.1 for ; Thu, 02 May 2024 02:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714643816; x=1715248616; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hscm9KdbM1whIxlQwwTQ6xBil1LPfb+u+PB5hBKBEJA=; b=YwufLK4fL7WvEkZ5dfh2QoZtWrUFywq45knQTAKvSIhbp+jJ5vm3Iti+DWJsnpbnWE 8t6mYlxMg6MPnAv3qNbcJ8UnqPy7m4H/TF/mhYvdSJZku6IDEruv+nXM/zVjqX8qQvdR cWjUOBsHe3DZmhDZr2Y/YtYHz80OmDxwT2LqbEHlHxXDWXGcdiBMCGi53LvL522zjrDm A+CzPIXjvtZ96pcxj+psCJVeyKWHeVBkv42yUqHYIUIv/Z0ZLF9Rr8tBmngRoTZaD3HN XRsmAd5AVFknLgYUmlEJMzFkh8t9MyH6YpQZk/CkdLuQG34uL3jT0SRqrMWvvuFWToiN Xesw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714643816; x=1715248616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hscm9KdbM1whIxlQwwTQ6xBil1LPfb+u+PB5hBKBEJA=; b=RLDTT8L/WzxnzKZS6M/aXbAz1303cU7VF2WpbskHC5RXLGefV6jXLzRmliVfUwlRLB 2RHUFZd9HeNLcF5FQ7iNe4rdyT5O+8m63It6A+ePVOqrlRbwJgvvg44OVrYyGLocpZor 4hshOp9rGs5D7r109ZWoFHJ/S45D5Bm1e2G8BZ+EK05TcblfvLfT/XQy2iSPrPDMQHAK HZycyv22ZO+3w3o0xrV9jM1xNpaYc8HNac4E0/s++uZ4ytCsSzEIr11IqNBpyoS0TUUw 5/DmrJZl2sRlTFloyJZZLf8rTJ1U6ZFUAkPFMUpSWGGg44yaZGGJD16GpMMig7DhVNaS kvIw== X-Gm-Message-State: AOJu0YxcRUMvjor5gR3hRiZGXP9iTsoenDx9AruPNhdshqu36kynBDMY CG+e6tc99Vz2vXlaWgOtENtd5OP+cJSQPKMaXe+55TZucP8XC2gBPgXVo7TE524vM6ECLRXp4i5 + X-Received: by 2002:adf:e508:0:b0:34c:8adf:8fc9 with SMTP id j8-20020adfe508000000b0034c8adf8fc9mr3384338wrm.51.1714643816476; Thu, 02 May 2024 02:56:56 -0700 (PDT) Received: from m1x-phil.lan ([176.187.215.106]) by smtp.gmail.com with ESMTPSA id r8-20020a5d4988000000b0034cceee9051sm853767wrq.105.2024.05.02.02.56.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 02:56:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?M?= =?utf-8?q?arc-Andr=C3=A9_Lureau?= , Thomas Huth , Paolo Bonzini , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/3] crypto: Restrict pkix_asn1_tab[] to crypto-tls-x509-helpers.c Date: Thu, 2 May 2024 11:56:41 +0200 Message-ID: <20240502095642.93368-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240502095642.93368-1-philmd@linaro.org> References: <20240502095642.93368-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/unit/crypto-tls-x509-helpers.h | 3 --- tests/unit/crypto-tls-x509-helpers.c | 6 +++++- tests/unit/{pkix_asn1_tab.c => pkix_asn1_tab.c.inc} | 5 +---- tests/qtest/meson.build | 3 +-- tests/unit/meson.build | 6 +++--- 5 files changed, 10 insertions(+), 13 deletions(-) rename tests/unit/{pkix_asn1_tab.c => pkix_asn1_tab.c.inc} (99%) 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/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/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}, diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index b128fa5a4b..f16931f82e 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -314,8 +314,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/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() From patchwork Thu May 2 09:56:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794108 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp153723wrr; Thu, 2 May 2024 02:57:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUvKRdl+4fM287bxhHdQ2+Y8T++xQUtDsMKpR36aN7Fky11Q5s/6JSoLlbzF4sNvuz1KaOW90vgNASXU3cV0PG4 X-Google-Smtp-Source: AGHT+IFio55desZpxhb5d9e1I+8gga80ItnteDOGJHHGKQdpD53QXrM/SF5s59P5D0DjnJ2GE4dF X-Received: by 2002:a05:6871:8783:b0:238:f6dc:6f7f with SMTP id td3-20020a056871878300b00238f6dc6f7fmr5155159oab.58.1714643860954; Thu, 02 May 2024 02:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714643860; cv=none; d=google.com; s=arc-20160816; b=Eakn26Hk+jZ1Xlfu7c4zCQb303n3DNt/JoIWTYPbPF54NnhOSURh4p4HIhgDc0WSMS su0yhHnVslpWT2vccqruRAZ4L2BW4CmNpC69fneBz/oCOYzhSSSm9BTfmQZiMHuM+7ik CMlGwwuvv8zscwCoKE22mZ7/e2lXNRE9B65yQFXnQOsJmySFXbO5jPcmnmG469WiS0Ha g7jkjuf2rL6qii8t6MyIXj0s7Ht/mHkl7g6n03Mg2yUtjd+j5rTQnnQ97lwgmWLLvo8/ j1g0ZZRqD4zlK0Hm5TGFD1wJ6A7rtl7r9ytXQipSA2vN7L7amyYukADlJdeK8lSntZwT nW4Q== 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=OWnrA6E91+7xAaPI8kCn9o7Y7ybTIOe7+SUe3y8pkFw=; fh=Dhpq/bjK0ChgMAY5mUf7XOR2DhtP3cS/r2w/r+nRC1I=; b=k4YKkD0DBaBAShX8tuW352eGtPOmD/hXB8rtGkEqtvklwjKlVARFyYaS8Rvz6N87/a PUtdThCpSnnMnKGzPLyp9O1aGLaJlS5pZeAWtK+j/E5QafbuKpSL1cpN2/++YPqUp+Rn Iib/Y4ONEg+aE7RfY7tddPfihaMO9XpDc+2v/0BlSX29gqVR1+J/v5hJ973IQQixk8By 8Ia+uRfmzo930t+P+lF6eqwsyumcZQywc/f2m6RrU76sP4l7seaI60K17LvhoO5GEG7d DZ4VNtG3IS9sStM0nsgP/zwYga5H0KDABg/C1oGVty8AJ2ildbjoqSOmo0lRskREpf0S GRLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BWEW6nVM; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k20-20020a05622a03d400b0043affcfcf50si598659qtx.303.2024.05.02.02.57.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2024 02:57:40 -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=@linaro.org header.s=google header.b=BWEW6nVM; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2TBb-0000gu-Vq; Thu, 02 May 2024 05:57:08 -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 1s2TBZ-0000eL-Rv for qemu-devel@nongnu.org; Thu, 02 May 2024 05:57:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2TBX-00019W-JQ for qemu-devel@nongnu.org; Thu, 02 May 2024 05:57:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-41b5e74fa83so51910315e9.0 for ; Thu, 02 May 2024 02:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714643822; x=1715248622; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OWnrA6E91+7xAaPI8kCn9o7Y7ybTIOe7+SUe3y8pkFw=; b=BWEW6nVMH90wQe/RV5ddg5LIKPiqhQF07BYhxegi/dG2+klv6/U+uHbuPGY2VOmuBI 4hlvzxmaR1Y9I13RvOzEG3aFsosdulGLGFmAvFJ/AAMNlVvGgisEgCNtCAbZ6XrkqMDy xk5sQNGOt5IPuwSEcYIIisnioKWVaSlLt+pY1DFtR83URpENFh9LY1GU215XdDYLXA+B a5XlE69qiqtJqOwSxnitYg4C4+CFbHM/GfP+BiEaulGhyna2gavK8gJc/zqAyr7nL4j5 hDVK3ocuNtGX0JuH2MbmUczns1M2vf5achAHoJoD4jAO1oJj5N5eE8bsxgU8i3Gh5XO5 AjZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714643822; x=1715248622; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OWnrA6E91+7xAaPI8kCn9o7Y7ybTIOe7+SUe3y8pkFw=; b=EYinyKU/+cETJaJFhECQygW1n8kp/hWgp7iMPvVKeEuO2OVvOv9JYqZ/29cDtTcq+t Jmh/JUZTfAPgwCOHdjeDB2pwnaoUDUoG/DTiZLJGbkJ/zO5ZgSr9IhPCO4hYYxKFuOLO 6L1v4QRGIaYqsmMsKAyR5/ENudVgaipOZUDGnkdeYjosXjxBGwnlu7Ks4+dGnWc4yB6Y JB6hc8WtjOiNkYERhxSVA7nlOCvOINCNMnv13RbF9a4hCcjnCDey1jE7sonyuXqLGhZc 6HewYb9d33dgvP+tQ2MH/ZmGMU8k2WTnFNfKzgmfjR6cehWE3haNDTOuVQEmL6/g/2VW f0nA== X-Gm-Message-State: AOJu0Yyn/VkH371dK8v4xkEGf8gvrqeF4mYwvkvNGoAO2OW1GcdcN6I+ 1NASdapyB80u2zdXlf6CaNrmJkANAHeqS7t4VHmk8wliq0FN+HXkeBfKLM0mBdZ7//2lznYp6Fc / X-Received: by 2002:a05:600c:444d:b0:418:ed23:a9f0 with SMTP id v13-20020a05600c444d00b00418ed23a9f0mr3554308wmn.18.1714643821957; Thu, 02 May 2024 02:57:01 -0700 (PDT) Received: from m1x-phil.lan ([176.187.215.106]) by smtp.gmail.com with ESMTPSA id n21-20020a05600c3b9500b0041a9fc2a6b5sm5111895wms.20.2024.05.02.02.57.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 02:57:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?M?= =?utf-8?q?arc-Andr=C3=A9_Lureau?= , Thomas Huth , Paolo Bonzini , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/3] crypto: Allow building with GnuTLS but without Libtasn1 Date: Thu, 2 May 2024 11:56:42 +0200 Message-ID: <20240502095642.93368-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240502095642.93368-1-philmd@linaro.org> References: <20240502095642.93368-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 We only use Libtasn1 in unit tests. As noted in commit d47b83b118 ("tests: add migration tests of TLS with x509 credentials"), having GnuTLS without Libtasn1 is a valid configuration, so do not require Libtasn1, to avoid: Dependency gnutls found: YES 3.7.1 (cached) Run-time dependency libtasn1 found: NO (tried pkgconfig) ../meson.build:1914:10: ERROR: Dependency "libtasn1" not found, tried pkgconfig Fixes: ba7ed407e6 ("configure, meson: convert libtasn1 detection to meson") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 5db2dbc12e..837a2bdb56 100644 --- a/meson.build +++ b/meson.build @@ -1912,6 +1912,7 @@ endif tasn1 = not_found if gnutls.found() tasn1 = dependency('libtasn1', + required: false, method: 'pkg-config') endif keyutils = not_found