tests: use enum for object types

Signed-off-by: Jakub Jelen <jjelen@redhat.com>

4 files changed, 22 insertions, 16 deletions

diff --git a/tests/common.c b/tests/common.c
index d1681f2..b3379c5 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -1,7 +1,7 @@
 /*
  * Shared test functions for libCACard
  *
- * Copyright 2018 Red Hat, Inc.
+ * Copyright 2018 - 2022 Red Hat, Inc.
  *
  * Author: Jakub Jelen <jjelen@redhat.com>
  *
@@ -98,7 +98,7 @@ void select_aid(VReader *reader, unsigned char *aid, unsigned int aid_len)
 }
 
 void get_properties_coid(VReader *reader, const unsigned char coid[2],
-                         int object_type)
+                         enum TestObjectType object_type)
 {
     int dwRecvLength = APDUBufSize;
     VReaderStatus status;
@@ -302,7 +302,7 @@ void get_properties_coid(VReader *reader, const unsigned char coid[2],
 
 }
 
-void get_properties(VReader *reader, int object_type)
+void get_properties(VReader *reader, enum TestObjectType object_type)
 {
     unsigned char coid[2];
     switch (object_type) {
@@ -330,13 +330,17 @@ void get_properties(VReader *reader, int object_type)
         get_properties_coid(reader, coid, object_type);
         break;
 
+    case TEST_GENERIC:
+    case TEST_EMPTY_BUFFER:
+    case TEST_EMPTY:
+    case TEST_PASSTHROUGH:
     default:
         g_debug("Got unknown object type");
         g_assert_not_reached();
     }
 }
 
-void read_buffer(VReader *reader, uint8_t type, int object_type)
+void read_buffer(VReader *reader, uint8_t type, enum TestObjectType object_type)
 {
     int dwRecvLength = APDUBufSize, dwLength, dwReadLength, offset, left;
     VReaderStatus status;
@@ -417,7 +421,7 @@ void read_buffer(VReader *reader, uint8_t type, int object_type)
     g_free(data);
 }
 
-void select_applet(VReader *reader, int type)
+void select_applet(VReader *reader, enum TestObjectType type)
 {
     uint8_t selfile_ccc[] = {
         /* Select CCC Applet */
@@ -476,6 +480,8 @@ void select_applet(VReader *reader, int type)
         aid_len = sizeof(selfile_empty);
         break;
 
+    case TEST_GENERIC:
+    case TEST_EMPTY_BUFFER:
     default:
         g_assert_not_reached();
     }
@@ -576,7 +582,7 @@ void do_sign(VReader *reader, int parts)
 
 }
 
-void do_decipher(VReader *reader, int type)
+void do_decipher(VReader *reader, enum TestObjectType type)
 {
     VReaderStatus status;
     int dwRecvLength = APDUBufSize;
diff --git a/tests/common.h b/tests/common.h
index 459d980..430713b 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -1,7 +1,7 @@
 /*
  * Shared test functions for libCACard
  *
- * Copyright 2018 Red Hat, Inc.
+ * Copyright 2018 - 2022 Red Hat, Inc.
  *
  * Author: Jakub Jelen <jjelen@redhat.com>
  *
@@ -15,7 +15,7 @@
 
 #define APDUBufSize 270
 
-enum {
+enum TestObjectType {
     TEST_PKI = 1,
     TEST_PKI_2,
     TEST_CCC,
@@ -32,16 +32,16 @@ void select_coid_bad(VReader *reader, unsigned char *coid);
 int select_aid_response(VReader *reader, unsigned char *aid,
                         unsigned int aid_len, int response);
 void select_aid(VReader *reader, unsigned char *aid, unsigned int aid_len);
-void select_applet(VReader *reader, int type);
+void select_applet(VReader *reader, enum TestObjectType type);
 
-void get_properties_coid(VReader *reader, const unsigned char coid[2], int object_type);
-void get_properties(VReader *reader, int object_type);
+void get_properties_coid(VReader *reader, const unsigned char coid[2], enum TestObjectType object_type);
+void get_properties(VReader *reader, enum TestObjectType object_type);
 
-void read_buffer(VReader *reader, uint8_t type, int object_type);
+void read_buffer(VReader *reader, uint8_t type, enum TestObjectType object_type);
 
 void do_sign(VReader *reader, int parts);
 
-void do_decipher(VReader *reader, int type);
+void do_decipher(VReader *reader, enum TestObjectType object_type);
 
 void test_empty_applets(void);
 
diff --git a/tests/hwtests.c b/tests/hwtests.c
index 2474578..a8abb3d 100644
--- a/tests/hwtests.c
+++ b/tests/hwtests.c
@@ -1,7 +1,7 @@
 /*
  * Test mirroring of CAC smart card
  *
- * Copyright 2018 Red Hat, Inc.
+ * Copyright 2018 - 2022 Red Hat, Inc.
  *
  * Author: Jakub Jelen <jjelen@redhat.com>
  *
diff --git a/tests/libcacard.c b/tests/libcacard.c
index 37dedbb..01305a7 100644
--- a/tests/libcacard.c
+++ b/tests/libcacard.c
@@ -1,7 +1,7 @@
 /*
  * Test general functionality of software emulated smart card
  *
- * Copyright 2018 Red Hat, Inc.
+ * Copyright 2018 - 2022 Red Hat, Inc.
  *
  * Authors:
  *  Marc-André Lureau <marcandre.lureau@redhat.com>
@@ -874,7 +874,7 @@ static void test_invalid_instruction(void)
     vreader_free(reader); /* get by id ref */
 }
 
-static void test_invalid_read_buffer_applet(VReader *reader, int object_type)
+static void test_invalid_read_buffer_applet(VReader *reader, enum TestObjectType object_type)
 {
 
     VReaderStatus status;