From nobody Fri Aug 28 00:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1786606925; cv=none; d=zohomail.com; s=zohoarc; b=Oyl0S/tTn57iiK/054//forRhY9z5csKOFLmywHmucKgdEDtYFB7H7wS3Gz8w/HDak6hNVz7nUpldZFnZha4/CIo9EHymIGn1iygWHApsiuaY8yl0qCrmtko1D/pEyj5Jq8JUrMGiFCyf69ZUB/iP1AIV1VS0gQIDuyHGyWNI60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786606925; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CIbpWjUtvkvAnhrymOxcwx4Ktsvc8OETpWaURWWsthY=; b=i+TQQq1CTMwU4Ck3vcRKxq0/QmJQY65z1QNzH1VY2Rp58ZZPAI/rBxaQXph8Iz3ZBfbsK9rWxUdJIUgRqNg3JUQR2f6gP4dakicM8Yp+7kR+oLH050PROB3Yny6gwupMISp3jz7mNl2E4Xh4dUD+wfsIlGU84Cz2sD/8WY/bEjg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786606925125164.76437764678292; Thu, 13 Aug 2026 00:42:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuQ4J-0005IS-4D; Thu, 13 Aug 2026 03:41:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wuQ4H-0005I8-5g for qemu-devel@nongnu.org; Thu, 13 Aug 2026 03:41:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wuQ4D-0003Hw-7A for qemu-devel@nongnu.org; Thu, 13 Aug 2026 03:41:35 -0400 Received: from mx-prod-mc-05.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-287-aFmeWqSlMEi7IxrruDQFow-1; Thu, 13 Aug 2026 03:40:52 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D1AA4195609D for ; Thu, 13 Aug 2026 07:40:51 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EB23B180049F; Thu, 13 Aug 2026 07:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1786606890; 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; bh=CIbpWjUtvkvAnhrymOxcwx4Ktsvc8OETpWaURWWsthY=; b=SMg1soDCV/UhQWolt+3+pImKN7vdXlm0EtgevJf8Y/SQ/xD6Z8ptRWObA95g7izN8kCFAT KgNCZ8cA1d8GF0pWIVGMF5sIy+xrwyy0Hx+eQg2abz+c/gUXMs7QJLsNBSlG+AOnC6pLVb Te6jtlZuUSAFZJEvuRW+znw76uPgDB8= X-MC-Unique: aFmeWqSlMEi7IxrruDQFow-1 X-Mimecast-MFC-AGG-ID: aFmeWqSlMEi7IxrruDQFow_1786606852 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH] crypto: fix build against nettle >= 4 Date: Thu, 13 Aug 2026 11:40:48 +0400 Message-ID: <20260813074048.3624651-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.104, 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_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1786606927384158500 From: Marc-Andr=C3=A9 Lureau sha.h has been deprecated. It seems we could just rely on sha1.h/sha2.h for older versions too, but I didn't check. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4184 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- crypto/hash-nettle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c index 53f68301efb5..c0ebb44e11f0 100644 --- a/crypto/hash-nettle.c +++ b/crypto/hash-nettle.c @@ -23,8 +23,14 @@ #include "qapi/error.h" #include "crypto/hash.h" #include "hashpriv.h" +#include #include +#if NETTLE_VERSION_MAJOR >=3D 4 +#include +#include +#else #include +#endif #include #ifdef CONFIG_CRYPTO_SM3 #include --=20 2.55.0.543.g5ebe2ebe4ea8