mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: fix building complaint

Browse Source 
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

Because gnutls 3.x still defines LIBGNUTLS_VERSION_NUMBER for back compat, Let's
use LIBGNUTLS_VERSION_NUMBER instead of GNUTLS_VERSION_NUMBER to fix building
complaint.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Gonglei 2016-09-05 20:36:19 +08:00 committed by Daniel P. Berrange
parent a5d2f44d0d
commit d9269b274a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/init.c
View File

@ -59,8 +59,7 @@
#if (defined(CONFIG_GCRYPT) && \ #if (defined(CONFIG_GCRYPT) && \
(!defined(CONFIG_GNUTLS) || \ (!defined(CONFIG_GNUTLS) || \
!defined(GNUTLS_VERSION_NUMBER) || \ (LIBGNUTLS_VERSION_NUMBER < 0x020c00)) && \
(GNUTLS_VERSION_NUMBER < 0x020c00)) && \
(!defined(GCRYPT_VERSION_NUMBER) || \ (!defined(GCRYPT_VERSION_NUMBER) || \
(GCRYPT_VERSION_NUMBER < 0x010600))) (GCRYPT_VERSION_NUMBER < 0x010600)))
#define QCRYPTO_INIT_GCRYPT_THREADS #define QCRYPTO_INIT_GCRYPT_THREADS

6
crypto/tlscredsx509.c
View File

@ -615,7 +615,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
} }
if (cert != NULL && key != NULL) { if (cert != NULL && key != NULL) {
#if GNUTLS_VERSION_NUMBER >= 0x030111 #if LIBGNUTLS_VERSION_NUMBER >= 0x030111
char *password = NULL; char *password = NULL;
if (creds->passwordid) { if (creds->passwordid) {
password = qcrypto_secret_lookup_as_utf8(creds->passwordid, password = qcrypto_secret_lookup_as_utf8(creds->passwordid,
@ -630,7 +630,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
password, password,
0); 0);
g_free(password); g_free(password);
#else /* GNUTLS_VERSION_NUMBER < 0x030111 */ #else /* LIBGNUTLS_VERSION_NUMBER < 0x030111 */
if (creds->passwordid) { if (creds->passwordid) {
error_setg(errp, "PKCS8 decryption requires GNUTLS >= 3.1.11"); error_setg(errp, "PKCS8 decryption requires GNUTLS >= 3.1.11");
goto cleanup; goto cleanup;
@ -638,7 +638,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
ret = gnutls_certificate_set_x509_key_file(creds->data, ret = gnutls_certificate_set_x509_key_file(creds->data,
cert, key, cert, key,
GNUTLS_X509_FMT_PEM); GNUTLS_X509_FMT_PEM);
#endif /* GNUTLS_VERSION_NUMBER < 0x030111 */ #endif
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Cannot load certificate '%s' & key '%s': %s", error_setg(errp, "Cannot load certificate '%s' & key '%s': %s",
cert, key, gnutls_strerror(ret)); cert, key, gnutls_strerror(ret));

1
tests/crypto-tls-x509-helpers.h
View File

@ -26,7 +26,6 @@
#if !(defined WIN32) && \ #if !(defined WIN32) && \
defined(CONFIG_TASN1) && \ defined(CONFIG_TASN1) && \
defined(LIBGNUTLS_VERSION_NUMBER) && \
(LIBGNUTLS_VERSION_NUMBER >= 0x020600) (LIBGNUTLS_VERSION_NUMBER >= 0x020600)
# define QCRYPTO_HAVE_TLS_TEST_SUPPORT # define QCRYPTO_HAVE_TLS_TEST_SUPPORT
#endif #endif