Commit 2b4ccb87 authored by Stefan Berger's avatar Stefan Berger
Browse files

test: Move common TPM test functions to tpm-tests.c 



Move common TPM test functions from tpm-crb-swtpm-test.c to tpm-tests.c
so that for example test cases with the TPM TIS interface can use the
same code. Prefix all funcions with 'tpm_test_'.

Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent b1e4b7c6

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) 
tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \

        tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y)

tests/tpm-crb-swtpm-test$(EXESUF): tests/tpm-crb-swtpm-test.o tests/tpm-emu.o \

	tests/tpm-util.o $(test-io-obj-y)

	tests/tpm-util.o tests/tpm-tests.o $(test-io-obj-y)

tests/tpm-crb-test$(EXESUF): tests/tpm-crb-test.o tests/tpm-emu.o $(test-io-obj-y)

tests/tpm-tis-test$(EXESUF): tests/tpm-tis-test.o tests/tpm-emu.o $(test-io-obj-y)

tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \

tests/tpm-crb-swtpm-test.c

+4 −95
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <glib/gstdio.h>



#include "libqtest.h"

#include "tpm-util.h"

#include "tpm-tests.h"



typedef struct TestState {

    char *src_tpm_path;
@@ -26,108 +26,17 @@ typedef struct TestState { 


static void tpm_crb_swtpm_test(const void *data)

{

    char *args = NULL;

    QTestState *s;

    SocketAddress *addr = NULL;

    gboolean succ;

    GPid swtpm_pid;

    GError *error = NULL;

    const TestState *ts = data;



    succ = tpm_util_swtpm_start(ts->src_tpm_path, &swtpm_pid, &addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev",

        addr->u.q_unix.path);



    s = qtest_start(args);

    g_free(args);



    tpm_util_startup(s, tpm_util_crb_transfer);

    tpm_util_pcrextend(s, tpm_util_crb_transfer);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(s, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_end();

    tpm_util_swtpm_kill(swtpm_pid);



    if (addr) {

        g_unlink(addr->u.q_unix.path);

        qapi_free_SocketAddress(addr);

    }

    tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_crb_transfer);

}



static void tpm_crb_swtpm_migration_test(const void *data)

{

    const TestState *ts = data;

    gboolean succ;

    GPid src_tpm_pid, dst_tpm_pid;

    SocketAddress *src_tpm_addr = NULL, *dst_tpm_addr = NULL;

    GError *error = NULL;

    QTestState *src_qemu, *dst_qemu;



    succ = tpm_util_swtpm_start(ts->src_tpm_path, &src_tpm_pid,

                                &src_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    succ = tpm_util_swtpm_start(ts->dst_tpm_path, &dst_tpm_pid,

                                &dst_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        goto err_src_tpm_kill;

    }



    tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,

                                  src_tpm_addr, dst_tpm_addr,

                                  ts->uri);



    tpm_util_startup(src_qemu, tpm_util_crb_transfer);

    tpm_util_pcrextend(src_qemu, tpm_util_crb_transfer);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(src_qemu, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    tpm_util_migrate(src_qemu, ts->uri);

    tpm_util_wait_for_migration_complete(src_qemu);



    tpm_util_pcrread(dst_qemu, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_quit(dst_qemu);

    qtest_quit(src_qemu);



    tpm_util_swtpm_kill(dst_tpm_pid);

    if (dst_tpm_addr) {

        g_unlink(dst_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(dst_tpm_addr);

    }



err_src_tpm_kill:

    tpm_util_swtpm_kill(src_tpm_pid);

    if (src_tpm_addr) {

        g_unlink(src_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(src_tpm_addr);

    }

    tpm_test_swtpm_migration_test(ts->src_tpm_path, ts->dst_tpm_path, ts->uri,

                                  tpm_util_crb_transfer);

}



int main(int argc, char **argv)

tests/tpm-tests.c

0 → 100644
+124 −0
Original line number Diff line number Diff line 
/*

 * QTest TPM commont test code

 *

 * Copyright (c) 2018 IBM Corporation

 * Copyright (c) 2018 Red Hat, Inc.

 *

 * Authors:

 *   Stefan Berger <stefanb@linux.vnet.ibm.com>

 *   Marc-André Lureau <marcandre.lureau@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include <glib/gstdio.h>



#include "libqtest.h"

#include "tpm-tests.h"



void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx)

{

    char *args = NULL;

    QTestState *s;

    SocketAddress *addr = NULL;

    gboolean succ;

    GPid swtpm_pid;

    GError *error = NULL;



    succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev",

        addr->u.q_unix.path);



    s = qtest_start(args);

    g_free(args);



    tpm_util_startup(s, tx);

    tpm_util_pcrextend(s, tx);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(s, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_end();

    tpm_util_swtpm_kill(swtpm_pid);



    if (addr) {

        g_unlink(addr->u.q_unix.path);

        qapi_free_SocketAddress(addr);

    }

}



void tpm_test_swtpm_migration_test(const char *src_tpm_path,

                                   const char *dst_tpm_path,

                                   const char *uri, tx_func *tx)

{

    gboolean succ;

    GPid src_tpm_pid, dst_tpm_pid;

    SocketAddress *src_tpm_addr = NULL, *dst_tpm_addr = NULL;

    GError *error = NULL;

    QTestState *src_qemu, *dst_qemu;



    succ = tpm_util_swtpm_start(src_tpm_path, &src_tpm_pid,

                                &src_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    succ = tpm_util_swtpm_start(dst_tpm_path, &dst_tpm_pid,

                                &dst_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        goto err_src_tpm_kill;

    }



    tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,

                                  src_tpm_addr, dst_tpm_addr, uri);



    tpm_util_startup(src_qemu, tx);

    tpm_util_pcrextend(src_qemu, tx);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(src_qemu, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    tpm_util_migrate(src_qemu, uri);

    tpm_util_wait_for_migration_complete(src_qemu);



    tpm_util_pcrread(dst_qemu, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_quit(dst_qemu);

    qtest_quit(src_qemu);



    tpm_util_swtpm_kill(dst_tpm_pid);

    if (dst_tpm_addr) {

        g_unlink(dst_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(dst_tpm_addr);

    }



err_src_tpm_kill:

    tpm_util_swtpm_kill(src_tpm_pid);

    if (src_tpm_addr) {

        g_unlink(src_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(src_tpm_addr);

    }

}

tests/tpm-tests.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * QTest TPM commont test code

 *

 * Copyright (c) 2018 IBM Corporation

 *

 * Authors:

 *   Stefan Berger <stefanb@linux.vnet.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#ifndef TESTS_TPM_TESTS_H

#define TESTS_TPM_TESTS_H



#include "tpm-util.h"



void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx);



void tpm_test_swtpm_migration_test(const char *src_tpm_path,

                                   const char *dst_tpm_path,

                                   const char *uri, tx_func *tx);



#endif /* TESTS_TPM_TESTS_H */