mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: call qcrypto_init instead of gnutls_global_init

Browse Source 
Calling qcrypto_init ensures that all relevant initialization is
done. In particular this honours the debugging settings and thread
settings.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-07-17 17:54:17 +01:00
parent 3bae150448
commit dbddad7026
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/crypto/init.h
View File

@ -21,6 +21,8 @@
#ifndef QCRYPTO_INIT_H #ifndef QCRYPTO_INIT_H
#define QCRYPTO_INIT_H #define QCRYPTO_INIT_H
#include "qapi/error.h"
int qcrypto_init(Error **errp); int qcrypto_init(Error **errp);
#endif /* QCRYPTO_INIT_H */ #endif /* QCRYPTO_INIT_H */

3
tests/crypto-tls-x509-helpers.c
View File

@ -21,6 +21,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "crypto-tls-x509-helpers.h" #include "crypto-tls-x509-helpers.h"
#include "crypto/init.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT #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) 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) { if (asn1_array2tree(pkix_asn1_tab, &pkix_asn1, NULL) != ASN1_SUCCESS) {
abort(); abort();