mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
crypto: fix initialization of crypto in tests
The test-io-channel-tls test was missing a call to qcrypto_init and test-crypto-hash was initializing it multiple times, Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
48b95ea4f0
commit
d26d6b5d34
|
@ -89,8 +89,6 @@ static void test_hash_alloc(void)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) {
|
||||
uint8_t *result = NULL;
|
||||
size_t resultlen = 0;
|
||||
|
@ -123,8 +121,6 @@ static void test_hash_prealloc(void)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) {
|
||||
uint8_t *result;
|
||||
size_t resultlen;
|
||||
|
@ -161,8 +157,6 @@ static void test_hash_iov(void)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) {
|
||||
struct iovec iov[3] = {
|
||||
{ .iov_base = (char *)INPUT_TEXT1, .iov_len = strlen(INPUT_TEXT1) },
|
||||
|
@ -199,8 +193,6 @@ static void test_hash_digest(void)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) {
|
||||
int ret;
|
||||
char *digest;
|
||||
|
@ -230,8 +222,6 @@ static void test_hash_base64(void)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) {
|
||||
int ret;
|
||||
char *digest;
|
||||
|
@ -253,6 +243,8 @@ static void test_hash_base64(void)
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
g_test_add_func("/crypto/hash/iov", test_hash_iov);
|
||||
g_test_add_func("/crypto/hash/alloc", test_hash_alloc);
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "io/channel-tls.h"
|
||||
#include "io/channel-socket.h"
|
||||
#include "io-channel-helpers.h"
|
||||
#include "crypto/init.h"
|
||||
#include "crypto/tlscredsx509.h"
|
||||
#include "qemu/acl.h"
|
||||
#include "qom/object_interfaces.h"
|
||||
|
@ -265,6 +266,8 @@ int main(int argc, char **argv)
|
|||
{
|
||||
int ret;
|
||||
|
||||
g_assert(qcrypto_init(NULL) == 0);
|
||||
|
||||
module_call_init(MODULE_INIT_QOM);
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1);
|
||||
|
|
Loading…
Reference in a new issue