From nobody Fri Nov 14 20:27:56 2025 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590572097; cv=none; d=zohomail.com; s=zohoarc; b=VPtz2xp0nKNeoY8xc5xtTKtP+0EJToIieWWwIMP06KBNclDeYTi1DbDnDFjJQIcjR+ap7fH8rbT8wrUr2l/Lv8kemP2QBtYxW6k5OgS2ULIjz+dyIlK+lQqJnF/7vM4yfpxZy/qa1QDDAAnTu4zpgxy3HMmpqt6A48JU2LvY3YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590572097; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=63qITC/tJoB5eHEQGa0oIJyr0nvomjx0A1xhaDX0wsE=; b=iv9sicHMulB+ag3VC7klkFfGE7QXHcqtbN5tFvQi4HLnq3RNuUVWZ70dsPt4GcHGETLn9CE7AtqkTGg5zq3z/k9RN92gqBva7Crfe7bTFNmNtjUyYZafXLpwA61EMNleq/EHB3mAKGD6ykSD5rXwqQjMRV3fC0/YgFFBR76OaZc= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590572097437125.85991639195515; Wed, 27 May 2020 02:34:57 -0700 (PDT) Received: from localhost ([::1]:40744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdsSd-0006qD-3Z for importer@patchew.org; Wed, 27 May 2020 05:34:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdsS1-0006Qv-Rv for qemu-devel@nongnu.org; Wed, 27 May 2020 05:34:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46979 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jdsS0-0002x8-PN for qemu-devel@nongnu.org; Wed, 27 May 2020 05:34:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-405-mcCeIyqOOr2aix2-doEsaw-1; Wed, 27 May 2020 05:34:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02807A0C09 for ; Wed, 27 May 2020 09:34:12 +0000 (UTC) Received: from foo.home.annexia.org (ovpn-112-79.ams2.redhat.com [10.36.112.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 464E019D82; Wed, 27 May 2020 09:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590572054; 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=63qITC/tJoB5eHEQGa0oIJyr0nvomjx0A1xhaDX0wsE=; b=Posdlr8a9WDGHuCFw+qjh+2WLK4wr5/tDYDvp7DLx+xL4MBzcwLi8C/UlY9Giz0v8vWlvb tPTewPnFrGopriRq9/It0A/bIBFlZH+Mq/4QAM/itLJFx5ztGkMU75mLdUgm1rVSNAcbBL ROafvVJ+qkJ4Dws7HXmalehXcAqc8MQ= X-MC-Unique: mcCeIyqOOr2aix2-doEsaw-1 From: "Richard W.M. Jones" To: qemu-devel@nongnu.org Subject: [PATCH] crypto: Remove use of GCRYPT_VERSION macro. Date: Wed, 27 May 2020 10:34:09 +0100 Message-Id: <20200527093409.3588189-1-rjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=rjones@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 01:25:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" According to the gcrypt documentation it's intended that gcry_check_version() is called with the minimum version of gcrypt needed by the program, not the version from the header file that happened to be installed when qemu was compiled. Indeed the gcrypt.h header says that you shouldn't use the GCRYPT_VERSION macro. This causes the following failure: qemu-img: Unable to initialize gcrypt if a slightly older version of libgcrypt is installed with a newer qemu, even though the slightly older version works fine. This can happen with RPM packaging which uses symbol versioning to determine automatically which libgcrypt is required by qemu, which caused the following bug in RHEL 8: https://bugzilla.redhat.com/show_bug.cgi?id=3D1840485 qemu actually requires libgcrypt >=3D 1.5.0, so we might put the string "1.5.0" here. However since 1.5.0 was released in 2011, it hardly seems we need to check that. So I replaced GCRYPT_VERSION with NULL. Perhaps in future if we move to requiring a newer version of gcrypt we could put a literal string here. Signed-off-by: Richard W.M. Jones Reviewed-by: Daniel P. Berrang=C3=A9 --- crypto/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/init.c b/crypto/init.c index b305381ec5..ea233b9192 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -122,7 +122,7 @@ int qcrypto_init(Error **errp) #endif =20 #ifdef CONFIG_GCRYPT - if (!gcry_check_version(GCRYPT_VERSION)) { + if (!gcry_check_version(NULL)) { error_setg(errp, "Unable to initialize gcrypt"); return -1; } --=20 2.26.2