From patchwork Mon Sep 5 12:02:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 9313569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3E9A6075E for ; Mon, 5 Sep 2016 12:07:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3D9728A48 for ; Mon, 5 Sep 2016 12:07:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A75DA28A50; Mon, 5 Sep 2016 12:07:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A1A928A48 for ; Mon, 5 Sep 2016 12:07:42 +0000 (UTC) Received: from localhost ([::1]:54224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgsgf-0003JO-9w for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Sep 2016 08:07:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgscO-00007U-Fj for qemu-devel@nongnu.org; Mon, 05 Sep 2016 08:03:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgscJ-0003BL-Ei for qemu-devel@nongnu.org; Mon, 05 Sep 2016 08:03:15 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:32540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgscI-0003Ap-Im for qemu-devel@nongnu.org; Mon, 05 Sep 2016 08:03:11 -0400 Received: from 172.24.1.136 (EHLO szxema411-hub.china.huawei.com) ([172.24.1.136]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DMR10346; Mon, 05 Sep 2016 20:02:48 +0800 (CST) Received: from SZXEMA503-MBS.china.huawei.com ([169.254.6.245]) by szxema411-hub.china.huawei.com ([10.82.72.70]) with mapi id 14.03.0235.001; Mon, 5 Sep 2016 20:02:43 +0800 From: "Gonglei (Arei)" To: "Daniel P. Berrange" Thread-Topic: [PATCH v2 1/2] crypto: fix building complaint Thread-Index: AQHSAnSM59OUD6b3Ik+dkbe2NqEKtaBqMZ6AgACPSvD//36LgIAAk/QA Date: Mon, 5 Sep 2016 12:02:42 +0000 Message-ID: <33183CC9F5247A488A2544077AF19020B03B466A@SZXEMA503-MBS.china.huawei.com> References: <1472530253-94132-1-git-send-email-arei.gonglei@huawei.com> <1472530253-94132-2-git-send-email-arei.gonglei@huawei.com> <20160905101443.GC17398@redhat.com> <33183CC9F5247A488A2544077AF19020B03B45EA@SZXEMA503-MBS.china.huawei.com> <20160905110413.GD17398@redhat.com> In-Reply-To: <20160905110413.GD17398@redhat.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.177.18.62] MIME-Version: 1.0 X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.57CD5EE9.01E7, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=169.254.6.245, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 311c4c391a70bed29149e6b2ab39e735 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Subject: Re: [Qemu-devel] [PATCH v2 1/2] crypto: fix building complaint X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP > -----Original Message----- > From: Daniel P. Berrange [mailto:berrange@redhat.com] > Sent: Monday, September 05, 2016 7:04 PM > To: Gonglei (Arei) > Cc: qemu-devel@nongnu.org > Subject: Re: [PATCH v2 1/2] crypto: fix building complaint > > On Mon, Sep 05, 2016 at 10:50:54AM +0000, Gonglei (Arei) wrote: > > > > > > > -----Original Message----- > > > From: Daniel P. Berrange [mailto:berrange@redhat.com] > > > Sent: Monday, September 05, 2016 6:15 PM > > > To: Gonglei (Arei) > > > Cc: qemu-devel@nongnu.org; dmitry@daynix.com > > > Subject: Re: [PATCH v2 1/2] crypto: fix building complaint > > > > > > On Tue, Aug 30, 2016 at 12:10:52PM +0800, Gonglei wrote: > > > > gnutls commit 846753877d renamed LIBGNUTLS_VERSION_NUMBER to > > > GNUTLS_VERSION_NUMBER. > > > > If using gnutls before that verion, we'll get the below warning: > > > > crypto/tlscredsx509.c:618:5: warning: "GNUTLS_VERSION_NUMBER" is > not > > > defined > > > > > > > > Signed-off-by: Gonglei > > > > --- > > > > crypto/tlscredsx509.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c > > > > index 520d34d..f2fd80f 100644 > > > > --- a/crypto/tlscredsx509.c > > > > +++ b/crypto/tlscredsx509.c > > > > @@ -615,7 +615,7 @@ > qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 > > > *creds, > > > > } > > > > > > > > if (cert != NULL && key != NULL) { > > > > -#if GNUTLS_VERSION_NUMBER >= 0x030111 > > > > +#if defined(GNUTLS_VERSION_NUMBER) && > > > GNUTLS_VERSION_NUMBER >= 0x030111 > > > > char *password = NULL; > > > > if (creds->passwordid) { > > > > password = > > > qcrypto_secret_lookup_as_utf8(creds->passwordid, > > > > > > Other places in this file still use LIBGNUTLS_VERSION_NUMBER, which is > > > good, because gnutls 3.x still defines LIBGNUTLS_VERSION_NUMBER for > > > back compat. > > > > > You mean using LIBGNUTLS_VERSION_NUMBER directly here? That's ok. > > Yes, > > > > The tests/test-crypto-tlscredsx509.c file also needs a similar fix. > > > > > Sorry? > > It also uses the GNUTLS_VERSION_NUMBER constant instead of > LIBGNUTLS_VERSION_NUMBER > What about the below patch? > Regards, > Daniel > -- > |: http://berrange.com -o- > http://www.flickr.com/photos/dberrange/ :| > |: http://libvirt.org -o- > http://virt-manager.org :| > |: http://autobuild.org -o- > http://search.cpan.org/~danberr/ :| > |: http://entangle-photo.org -o- > http://live.gnome.org/gtk-vnc :| diff --git a/crypto/init.c b/crypto/init.c index 1e564d9..16e099b 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -59,8 +59,7 @@ #if (defined(CONFIG_GCRYPT) && \ (!defined(CONFIG_GNUTLS) || \ - !defined(GNUTLS_VERSION_NUMBER) || \ - (GNUTLS_VERSION_NUMBER < 0x020c00)) && \ + (LIBGNUTLS_VERSION_NUMBER < 0x020c00)) && \ (!defined(GCRYPT_VERSION_NUMBER) || \ (GCRYPT_VERSION_NUMBER < 0x010600))) #define QCRYPTO_INIT_GCRYPT_THREADS diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 520d34d..50eb54f 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -615,7 +615,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds, } if (cert != NULL && key != NULL) { -#if GNUTLS_VERSION_NUMBER >= 0x030111 +#if LIBGNUTLS_VERSION_NUMBER >= 0x030111 char *password = NULL; if (creds->passwordid) { password = qcrypto_secret_lookup_as_utf8(creds->passwordid, @@ -630,7 +630,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds, password, 0); g_free(password); -#else /* GNUTLS_VERSION_NUMBER < 0x030111 */ +#else /* LIBGNUTLS_VERSION_NUMBER < 0x030111 */ if (creds->passwordid) { error_setg(errp, "PKCS8 decryption requires GNUTLS >= 3.1.11"); goto cleanup; @@ -638,7 +638,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds, ret = gnutls_certificate_set_x509_key_file(creds->data, cert, key, GNUTLS_X509_FMT_PEM); -#endif /* GNUTLS_VERSION_NUMBER < 0x030111 */ +#endif if (ret < 0) { error_setg(errp, "Cannot load certificate '%s' & key '%s': %s", cert, key, gnutls_strerror(ret)); diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helpers.h index 356b49c..a8faa92 100644 --- a/tests/crypto-tls-x509-helpers.h +++ b/tests/crypto-tls-x509-helpers.h @@ -26,7 +26,6 @@ #if !(defined WIN32) && \ defined(CONFIG_TASN1) && \ - defined(LIBGNUTLS_VERSION_NUMBER) && \ (LIBGNUTLS_VERSION_NUMBER >= 0x020600) # define QCRYPTO_HAVE_TLS_TEST_SUPPORT #endif