diff options
| author | Peter Maydell | 2018-07-24 18:51:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-24 18:51:36 +0200 |
| commit | debe96fdeca911247d4b4862ce0a2a5bc27d6b35 (patch) | |
| tree | aedfa592cee91f1cde2d85901130c211798d4c99 /tests/crypto-tls-x509-helpers.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | tests: fix TLS handshake failure with TLS 1.3 (diff) | |
| download | qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.tar.gz qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.tar.xz qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Fix unit test compatibility with TLS 1.3
# gpg: Signature made Tue 24 Jul 2018 17:44:14 BST
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-pull-request:
tests: fix TLS handshake failure with TLS 1.3
tests: use error_abort in places expecting errors
tests: don't silence error reporting for all tests
tests: call qcrypto_init instead of gnutls_global_init
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/crypto-tls-x509-helpers.c')
| -rw-r--r-- | tests/crypto-tls-x509-helpers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c index 173d4e28fb..9b669c2a4b 100644 --- a/tests/crypto-tls-x509-helpers.c +++ b/tests/crypto-tls-x509-helpers.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "crypto-tls-x509-helpers.h" +#include "crypto/init.h" #include "qemu/sockets.h" #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT @@ -95,7 +96,7 @@ static gnutls_x509_privkey_t test_tls_load_key(void) void test_tls_init(const char *keyfile) { - gnutls_global_init(); + qcrypto_init(&error_abort); if (asn1_array2tree(pkix_asn1_tab, &pkix_asn1, NULL) != ASN1_SUCCESS) { abort(); |