8e0f4e6086
Update to v2.10.1 a stable, bug-fix-only release Also needed one more fix for qemu-testsuite OBS-URL: https://build.opensuse.org/request/show/531017 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=367
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From 3578aeb73b6bfd11643fe65f34b454f4a6bd957e Mon Sep 17 00:00:00 2001
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
Date: Tue, 29 Aug 2017 17:03:30 +0100
|
|
Subject: [PATCH] crypto: fix test cert generation to not use SHA1 algorithm
|
|
|
|
GNUTLS 3.6.0 marked SHA1 as untrusted for certificates.
|
|
Unfortunately the gnutls_x509_crt_sign() method we are
|
|
using to create certificates in the test suite is fixed
|
|
to always use SHA1. We must switch to a different method
|
|
and explicitly ask for SHA256.
|
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
(cherry picked from commit 23c1595b0297e6ca8f37559af6f0b8533aa1fd99)
|
|
[BR: We're getting failures in qemu-testsuite. This fix either resolves
|
|
that failure, or has been identified as being a qemu-testsuite failure
|
|
fix in related code]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tests/crypto-tls-x509-helpers.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
|
|
index 64073d3bd3..173d4e28fb 100644
|
|
--- a/tests/crypto-tls-x509-helpers.c
|
|
+++ b/tests/crypto-tls-x509-helpers.c
|
|
@@ -406,7 +406,8 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
|
|
* If no 'ca' is set then we are self signing
|
|
* the cert. This is done for the root CA certs
|
|
*/
|
|
- err = gnutls_x509_crt_sign(crt, ca ? ca : crt, privkey);
|
|
+ err = gnutls_x509_crt_sign2(crt, ca ? ca : crt, privkey,
|
|
+ GNUTLS_DIG_SHA256, 0);
|
|
if (err < 0) {
|
|
g_critical("Failed to sign certificate %s",
|
|
gnutls_strerror(err));
|