Re: [Qemu-devel] [PATCH v2 1/2] crypto: fix building complaint

[Daniel P. Berrange]

On Mon, Sep 05, 2016 at 10:50:54AM +0000, Gonglei (Arei) wrote:
> 
> 
> > -----Original Message-----
> > From: Daniel P. Berrange [mailto:address@hidden
> > Sent: Monday, September 05, 2016 6:15 PM
> > To: Gonglei (Arei)
> > Cc: address@hidden; address@hidden
> > 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 <address@hidden>
> > > ---
> > >  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

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 :|