Commit d26d6b5d authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 48b95ea4

tests/test-crypto-hash.c

+2 −10
Original line number Diff line number Diff line
@@ -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);

tests/test-io-channel-tls.c

+3 −0
Original line number Diff line number Diff line
@@ -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);