1 files changed, 27 insertions, 12 deletions
diff --git a/src/p11-tests.h b/src/p11-tests.h
index 82bc691..efacace 100644
--- a/src/p11-tests.h
+++ b/src/p11-tests.h
@@ -21,20 +21,10 @@
 extern int p11t_test_unexpected;
 
 /* -------------------------------------------------------------------
- * msg.c
+ * certificate.c
  */
 
-const char* p11t_msg_rv(CK_RV rv);
-const char* p11t_msg_lasterr(void);
-
-void p11t_msg_va(const char *message, va_list va);
-void p11t_msg_code(const char* code, const char *message, va_list va);
-void p11t_msg_print(const char *message, ...);
-void p11t_msg_fatal(const char *message, ...);
-const char* p11t_msg_prefix(const char *prefix);
-
-#define p11t_msg_here() \
-	(__func__ "() at " __FILE__ ":"  __LINE__)
+void p11t_certificate_tests(void);
 
 /* -------------------------------------------------------------------
  * check.c
@@ -57,6 +47,9 @@ extern int p11t_check_verbose;
 #define P11T_CHECK_FAIL(what) \
 	_P11T_BEGIN p11t_check_fail("%s", (what)); return STOP; _P11T_END
 
+#define P11T_CHECK_FAIL_MSG(what, msg) \
+	_P11T_BEGIN p11t_check_fail("%s: %s", (what), (msg)); return STOP; _P11T_END
+
 int p11t_check_fail(const char *message, ...);
 int p11t_check_warn(const char *message, ...);
 int p11t_check_info(const char *message, ...);
@@ -101,6 +94,11 @@ int _p11t_check_bool(const char *what, CK_BBOOL value);
 
 int _p11t_check_string(const char *what, CK_UTF8CHAR_PTR value, CK_ULONG length);
 
+#define P11T_CHECK_DATE(what, value) \
+	_P11T_BEGIN if(!_p11t_check_date((what), (value))) return STOP; _P11T_END
+
+int _p11t_check_date(const char *what, CK_DATE* value);
+
 #define P11T_CHECK_NOTE(what)
 
 /* -------------------------------------------------------------------
@@ -121,6 +119,23 @@ CK_OBJECT_HANDLE p11t_key_get_private(CK_SESSION_HANDLE session, CK_OBJECT_HANDL
 RSA* p11t_key_export_public_rsa(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key);
 
 /* -------------------------------------------------------------------
+ * msg.c
+ */
+
+const char* p11t_msg_rv(CK_RV rv);
+const char* p11t_msg_os(void);
+const char* p11t_msg_openssl(void);
+
+void p11t_msg_va(const char *message, va_list va);
+void p11t_msg_code(const char* code, const char *message, va_list va);
+void p11t_msg_print(const char *message, ...);
+void p11t_msg_fatal(const char *message, ...);
+const char* p11t_msg_prefix(const char *prefix);
+
+#define p11t_msg_here() \
+	(__func__ "() at " __FILE__ ":"  __LINE__)
+
+/* -------------------------------------------------------------------
  * module.c
  */