| Message ID | 1474677379-344832-1-git-send-email-arei.gonglei@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Sat, Sep 24, 2016 at 08:36:19AM +0800, Gonglei wrote: > 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 <arei.gonglei@huawei.com> > --- > v3: fix an error: "LIBGNUTLS_VERSION_NUMBER" is not defined (Daniel) > v2: add condition check for TLS support (Daniel) > > tests/pkix_asn1_tab.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c > index 903bc02..f15fc51 100644 > --- a/tests/pkix_asn1_tab.c > +++ b/tests/pkix_asn1_tab.c > @@ -4,7 +4,9 @@ > */ > > #include "qemu/osdep.h" > -#include <libtasn1.h> > +#include "tests/crypto-tls-x509-helpers.h" > + > +#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT > > const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { > {"PKIX1", 536875024, 0}, > @@ -1103,3 +1105,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { > {0, 1048586, "2"}, > {0, 0, 0} > }; > +#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ Thanks, I've queued this patch. Regards, Daniel
diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c index 903bc02..f15fc51 100644 --- a/tests/pkix_asn1_tab.c +++ b/tests/pkix_asn1_tab.c @@ -4,7 +4,9 @@ */ #include "qemu/osdep.h" -#include <libtasn1.h> +#include "tests/crypto-tls-x509-helpers.h" + +#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { {"PKIX1", 536875024, 0}, @@ -1103,3 +1105,4 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = { {0, 1048586, "2"}, {0, 0, 0} }; +#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
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 <arei.gonglei@huawei.com> --- v3: fix an error: "LIBGNUTLS_VERSION_NUMBER" is not defined (Daniel) v2: add condition check for TLS support (Daniel) tests/pkix_asn1_tab.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)