mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
tests: filter out TLS distinguished name in certificate checks
The version of GNUTLS in Fedora 34 has changed the order in which encodes fields when generating new TLS certificates. This in turn changes the order seen when querying the distinguished name. This ultimately breaks the expected output in the NBD TLS iotests. We don't need to be comparing the exact distinguished name text for the purpose of the test though, so it is fine to filter it out. Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20210804180330.3469683-1-berrange@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
parent
50482fda98
commit
a6d2bb25cf
3 changed files with 8 additions and 3 deletions
|
@ -148,7 +148,7 @@ $QEMU_IMG info --image-opts \
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "== final server log =="
|
echo "== final server log =="
|
||||||
cat "$TEST_DIR/server.log"
|
cat "$TEST_DIR/server.log" | _filter_authz_check_tls
|
||||||
rm -f "$TEST_DIR/server.log"
|
rm -f "$TEST_DIR/server.log"
|
||||||
|
|
||||||
# success, all done
|
# success, all done
|
||||||
|
|
|
@ -65,6 +65,6 @@ qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': F
|
||||||
== final server log ==
|
== final server log ==
|
||||||
qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
|
qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
|
||||||
qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
|
qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
|
||||||
qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client1,L=R'lyeh,C=South Pacific is denied
|
qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
|
||||||
qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client3,L=R'lyeh,C=South Pacific is denied
|
qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
|
||||||
*** done
|
*** done
|
||||||
|
|
|
@ -332,5 +332,10 @@ for fname in fnames:
|
||||||
sys.stdout.write(result)'
|
sys.stdout.write(result)'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_filter_authz_check_tls()
|
||||||
|
{
|
||||||
|
$SED -e 's/TLS x509 authz check for .* is denied/TLS x509 authz check for DISTINGUISHED-NAME is denied/'
|
||||||
|
}
|
||||||
|
|
||||||
# make sure this script returns success
|
# make sure this script returns success
|
||||||
true
|
true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue