7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From c64bd463b120056ff1e6c32e48fa24b6afd17f23 Mon Sep 17 00:00:00 2001
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
Date: Sat, 12 Oct 2024 13:47:25 +0800
|
|
Subject: [PATCH] crypto: drop gnutls debug logging support MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
GNUTLS already supports dynamically enabling its logging at runtime by
|
|
setting the env var 'GNUTLS_DEBUG_LEVEL=10', so there is no need to
|
|
re-invent this logic in QEMU in a way that requires a re-compile.
|
|
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
---
|
|
crypto/init.c | 15 ++++-----------
|
|
1 file changed, 4 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/crypto/init.c b/crypto/init.c
|
|
index fb7f1bff10..674d237fa9 100644
|
|
--- a/crypto/init.c
|
|
+++ b/crypto/init.c
|
|
@@ -34,14 +34,11 @@
|
|
|
|
#include "crypto/random.h"
|
|
|
|
-/* #define DEBUG_GNUTLS */
|
|
-#ifdef DEBUG_GNUTLS
|
|
-static void qcrypto_gnutls_log(int level, const char *str)
|
|
-{
|
|
- fprintf(stderr, "%d: %s", level, str);
|
|
-}
|
|
-#endif
|
|
|
|
+/*
|
|
+ * To debug GNUTLS see env vars listed in
|
|
+ * https://gnutls.org/manual/html_node/Debugging-and-auditing.html
|
|
+ */
|
|
int qcrypto_init(Error **errp)
|
|
{
|
|
#ifdef CONFIG_GNUTLS
|
|
@@ -53,10 +50,6 @@ int qcrypto_init(Error **errp)
|
|
gnutls_strerror(ret));
|
|
return -1;
|
|
}
|
|
-#ifdef DEBUG_GNUTLS
|
|
- gnutls_global_set_log_level(10);
|
|
- gnutls_global_set_log_function(qcrypto_gnutls_log);
|
|
-#endif
|
|
#endif
|
|
|
|
#ifdef CONFIG_GCRYPT
|
|
--
|
|
2.41.0.windows.1
|
|
|