From 857d6e052d5d800ea12f9ff102b80fd3c1cd989d Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Mon, 10 Aug 2020 15:17:14 +0800 Subject: [PATCH 1/2] tests: Disable tlscreds testcase Signed-off-by: Ying Fang --- qemu.spec | 4 +++ tests-Disable-tlscreds-testcase.patch | 36 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 tests-Disable-tlscreds-testcase.patch diff --git a/qemu.spec b/qemu.spec index 61d4cf47..6b2ed4b8 100644 --- a/qemu.spec +++ b/qemu.spec @@ -183,6 +183,7 @@ Patch0170: megasas-use-unsigned-type-for-reply_queue_head-and-c.patch Patch0171: megasas-avoid-NULL-pointer-dereference.patch Patch0172: megasas-use-unsigned-type-for-positive-numeric-field.patch Patch0173: hw-scsi-megasas-Fix-possible-out-of-bounds-array-acc.patch +Patch0174: tests-Disable-tlscreds-testcase.patch BuildRequires: flex BuildRequires: bison @@ -528,6 +529,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Mon Aug 10 2020 Huawei Technologies Co., Ltd +- tests: Disable tlscreds testcase + * Thu Aug 6 2020 Huawei Technologies Co., Ltd - es1370: check total frame count against current frame - exec: set map length to zero when returning NULL diff --git a/tests-Disable-tlscreds-testcase.patch b/tests-Disable-tlscreds-testcase.patch new file mode 100644 index 00000000..26950bf7 --- /dev/null +++ b/tests-Disable-tlscreds-testcase.patch @@ -0,0 +1,36 @@ +From 6215ac499b03300daad86edea4a4dbe95f7b2dc1 Mon Sep 17 00:00:00 2001 +From: Ying Fang +Date: Mon, 10 Aug 2020 15:01:40 +0800 +Subject: [PATCH] tests: Disable tlscreds testcase + +Unexpected error in qcrypto_tls_creds_check_cert_pair() at crypto/tlscredsx509.c:363 +Our own certificate tests/test-crypto-tlscredsx509-certs//server-cert.pem \ +failed validation against tests/test-crypto-tlscredsx509-certs//ca-cert.pem: \ +The certificate uses an insecure algorithm + +Signed-off-by: Ying Fang + +diff --git a/tests/Makefile.include b/tests/Makefile.include +index f3273ad3..168beddf 100644 +--- a/tests/Makefile.include ++++ b/tests/Makefile.include +@@ -111,8 +111,6 @@ check-speed-$(CONFIG_BLOCK) += tests/benchmark-crypto-hmac$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-crypto-cipher$(EXESUF) + check-speed-$(CONFIG_BLOCK) += tests/benchmark-crypto-cipher$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-crypto-secret$(EXESUF) +-check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlscredsx509$(EXESUF) +-check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlssession$(EXESUF) + ifneq (,$(findstring qemu-ga,$(TOOLS))) + check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) + endif +@@ -125,7 +123,6 @@ check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_AUTH_PAM)) += tests/test-authz-p + check-unit-$(CONFIG_BLOCK) += tests/test-io-task$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-socket$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-file$(EXESUF) +-check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-io-channel-tls$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-command$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-buffer$(EXESUF) + check-unit-y += tests/test-base64$(EXESUF) +-- +2.23.0 + -- Gitee From d551fd6a9a6b4414af510cba499553105731aeea Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Mon, 10 Aug 2020 15:18:07 +0800 Subject: [PATCH 2/2] spec: Update release version increase release version by one Signed-off-by: Ying Fang --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 6b2ed4b8..7682cf55 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 16 +Release: 17 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY -- Gitee