From patchwork Thu Sep 22 08:56:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 673251 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3sfrkY2w4Lz9t1b for ; Thu, 22 Sep 2016 19:27:49 +1000 (AEST) Received: from localhost ([::1]:34043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn0IE-0004wu-R4 for incoming@patchwork.ozlabs.org; Thu, 22 Sep 2016 05:27:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmzoS-0008O1-Er for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmzoO-0003sx-4j for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:57:00 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:13383) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmzoN-0003sQ-I1 for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:56:56 -0400 Received: from 172.24.1.47 (EHLO szxeml434-hub.china.huawei.com) ([172.24.1.47]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CIG24328; Thu, 22 Sep 2016 16:56:50 +0800 (CST) Received: from localhost (10.177.18.62) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.235.1; Thu, 22 Sep 2016 16:56:40 +0800 From: Gonglei To: Date: Thu, 22 Sep 2016 16:56:39 +0800 Message-ID: <1474534599-322216-1-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 2.6.3.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.18.62] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.57E39CD4.003A, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 417a75a56ca17007be7e091b94dcfa49 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH v2] qtest: fix make check complaint in crypto module 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: Gonglei , wu.wubin@huawei.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" CC tests/test-crypto-tlscredsx509.o CC tests/crypto-tls-x509-helpers.o CC tests/pkix_asn1_tab.o tests/pkix_asn1_tab.c:7:22: warning: libtasn1.h: No such file or directory tests/pkix_asn1_tab.c:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘pkix_asn1_tab’ make: *** [tests/pkix_asn1_tab.o] Error 1 Signed-off-by: Gonglei --- v2: add condition check for TLS support (Daniel) --- tests/pkix_asn1_tab.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c index 903bc02..036e222b 100644 --- a/tests/pkix_asn1_tab.c +++ b/tests/pkix_asn1_tab.c @@ -4,6 +4,14 @@ */ #include "qemu/osdep.h" +#if !(defined WIN32) && \ + defined(CONFIG_TASN1) && \ + (LIBGNUTLS_VERSION_NUMBER >= 0x020600) +#define QCRYPTO_HAVE_TLS_TEST_SUPPORT +#endif + +#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT + #include const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { @@ -1103,3 +1111,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { {0, 1048586, "2"}, {0, 0, 0} }; +#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */