[gnome-keyring] Implement an initial test of the prompting functionality.



commit 6d556cef7e37466f121f274bf8e6deba20db15e3
Author: Stef Walter <stef memberwebs com>
Date:   Tue Jun 8 04:07:42 2010 +0000

    Implement an initial test of the prompting functionality.

 configure.in                                     |    1 +
 pkcs11/.gitignore                                |    2 +
 pkcs11/gkm/Makefile.am                           |    1 +
 pkcs11/gkm/gkm-attributes.c                      |    7 +
 pkcs11/gkm/gkm-attributes.h                      |    3 +
 pkcs11/gkm/gkm-test.c                            | 1469 ++++++++++++++++++++++
 pkcs11/gkm/gkm-test.h                            |  380 ++++++
 pkcs11/gkm/gkm-util.c                            |   24 +-
 pkcs11/gkm/gkm-util.h                            |    4 +-
 pkcs11/wrap-layer/Makefile.am                    |   10 +
 pkcs11/wrap-layer/gkm-wrap-prompt.c              |    3 +
 pkcs11/wrap-layer/tests/Makefile.am              |   24 +
 pkcs11/wrap-layer/tests/test-create-credential.c |  170 +++
 13 files changed, 2095 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index b258d25..409425b 100644
--- a/configure.in
+++ b/configure.in
@@ -585,6 +585,7 @@ pkcs11/ssh-store/tests/Makefile
 pkcs11/user-store/Makefile
 pkcs11/user-store/tests/Makefile
 pkcs11/wrap-layer/Makefile
+pkcs11/wrap-layer/tests/Makefile
 po/Makefile.in
 tests/Makefile
 tool/Makefile
diff --git a/pkcs11/.gitignore b/pkcs11/.gitignore
index c026fd6..a23efdb 100644
--- a/pkcs11/.gitignore
+++ b/pkcs11/.gitignore
@@ -2,3 +2,5 @@
 /Makefile.in
 /.deps
 /.libs
+
+/wrap-layer/tests/test-create-credential
diff --git a/pkcs11/gkm/Makefile.am b/pkcs11/gkm/Makefile.am
index d9ba884..b0c388b 100644
--- a/pkcs11/gkm/Makefile.am
+++ b/pkcs11/gkm/Makefile.am
@@ -52,6 +52,7 @@ libgkm_la_SOURCES = \
 	gkm-sexp.c gkm-sexp.h \
 	gkm-sexp-key.c gkm-sexp-key.h \
 	gkm-store.c gkm-store.h \
+	gkm-test.c gkm-test.h \
 	gkm-timer.c gkm-timer.h \
 	gkm-transaction.c gkm-transaction.h \
 	gkm-types.h \
diff --git a/pkcs11/gkm/gkm-attributes.c b/pkcs11/gkm/gkm-attributes.c
index 21e5f34..7028bdc 100644
--- a/pkcs11/gkm/gkm-attributes.c
+++ b/pkcs11/gkm/gkm-attributes.c
@@ -600,6 +600,13 @@ gkm_template_free (GArray *template)
 	g_array_free (template, TRUE);
 }
 
+CK_ATTRIBUTE_PTR
+gkm_template_find (GArray *template, CK_ATTRIBUTE_TYPE type)
+{
+	g_return_val_if_fail (template, NULL);
+	return gkm_attributes_find ((CK_ATTRIBUTE_PTR)template->data, template->len, type);
+}
+
 gboolean
 gkm_template_find_boolean (GArray *template, CK_ATTRIBUTE_TYPE type, gboolean *value)
 {
diff --git a/pkcs11/gkm/gkm-attributes.h b/pkcs11/gkm/gkm-attributes.h
index 943d7d9..bb6a3d0 100644
--- a/pkcs11/gkm/gkm-attributes.h
+++ b/pkcs11/gkm/gkm-attributes.h
@@ -123,6 +123,9 @@ void                  gkm_template_set                                 (GArray *
 
 void                  gkm_template_free                                (GArray *template);
 
+CK_ATTRIBUTE_PTR      gkm_template_find                                (GArray *template,
+                                                                        CK_ATTRIBUTE_TYPE type);
+
 gboolean              gkm_template_find_boolean                        (GArray *template,
                                                                         CK_ATTRIBUTE_TYPE type,
                                                                         gboolean *value);
diff --git a/pkcs11/gkm/gkm-test.c b/pkcs11/gkm/gkm-test.c
new file mode 100644
index 0000000..820cda3
--- /dev/null
+++ b/pkcs11/gkm/gkm-test.c
@@ -0,0 +1,1469 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2010 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General  License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General  License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "gkm-attributes.h"
+#include "gkm-test.h"
+#include "gkm-util.h"
+
+#include "pkcs11/pkcs11.h"
+
+#include <glib.h>
+
+#include <string.h>
+
+void
+gkm_assertion_message_cmprv (const gchar *domain, const gchar *file, int line,
+                             const gchar *func, const gchar *expr,
+                             CK_RV arg1, const gchar *cmp, CK_RV arg2)
+{
+	gchar *a1, *a2, *s;
+	a1 = gkm_util_rv_to_string (arg1);
+	a2 = gkm_util_rv_to_string (arg2);
+	s = g_strdup_printf ("assertion failed (%s): (%s %s %s)", expr, a1, cmp, a2);
+	g_free (a1);
+	g_free (a2);
+	g_assertion_message (domain, file, line, func, s);
+	g_free (s);
+}
+
+/* -------------------------------------------------------------------------------
+ * TEST MODULE
+ */
+
+static gboolean initialized = FALSE;
+static gchar *the_pin = NULL;
+
+static gboolean logged_in = FALSE;
+static CK_USER_TYPE user_type = 0;
+static CK_FUNCTION_LIST functionList;
+
+typedef enum _Operation {
+	OP_FIND = 1,
+	OP_CRYPTO
+} Operation;
+
+typedef struct _Session {
+	CK_SESSION_HANDLE handle;
+	CK_SESSION_INFO info;
+	GHashTable *objects;
+
+	Operation operation;
+
+	/* For find operations */
+	GList *matches;
+
+	/* For crypto operations */
+	CK_OBJECT_HANDLE crypto_key;
+	CK_ATTRIBUTE_TYPE crypto_method;
+	CK_MECHANISM_TYPE crypto_mechanism;
+	CK_BBOOL want_context_login;
+
+	/* For 'signing' with CKM_T_PREFIX */
+	CK_BYTE sign_prefix[128];
+	CK_ULONG n_sign_prefix;
+} Session;
+
+static guint unique_identifier = 100;
+static GHashTable *the_sessions = NULL;
+static GHashTable *the_objects = NULL;
+
+enum {
+	PRIVATE_KEY_CAPITALIZE = 3,
+	PUBLIC_KEY_CAPITALIZE = 4,
+	PRIVATE_KEY_PREFIX = 5,
+	PUBLIC_KEY_PREFIX = 6
+};
+
+#define SIGNED_PREFIX "signed-prefix:"
+
+/*
+ * This is not a generic test module, it works in concert with the
+ * unit-test-gp11-module.c
+ */
+
+static void
+free_session (gpointer data)
+{
+	Session *sess = (Session*)data;
+	if (sess)
+		g_hash_table_destroy (sess->objects);
+	g_free (sess);
+}
+
+static GArray*
+lookup_object (Session *session, CK_OBJECT_HANDLE hObject)
+{
+	GArray *attrs;
+	attrs = g_hash_table_lookup (the_objects, GUINT_TO_POINTER (hObject));
+	if (!attrs)
+		attrs = g_hash_table_lookup (session->objects, GUINT_TO_POINTER (hObject));
+	return attrs;
+}
+
+CK_RV
+gkm_test_C_Initialize (CK_VOID_PTR pInitArgs)
+{
+#if 0
+	GArray *attrs;
+	CK_ULONG value;
+#endif
+	CK_C_INITIALIZE_ARGS_PTR args;
+
+	g_return_val_if_fail (initialized == FALSE, CKR_CRYPTOKI_ALREADY_INITIALIZED);
+
+	args = (CK_C_INITIALIZE_ARGS_PTR)pInitArgs;
+	if (args) {
+		g_return_val_if_fail(
+		              (args->CreateMutex == NULL && args->DestroyMutex == NULL &&
+		               args->LockMutex == NULL && args->UnlockMutex == NULL) ||
+		              (args->CreateMutex != NULL && args->DestroyMutex != NULL &&
+		               args->LockMutex != NULL && args->UnlockMutex != NULL),
+		               CKR_ARGUMENTS_BAD);
+
+		/* Flags should allow OS locking and os threads */
+		g_return_val_if_fail (args->flags & CKF_OS_LOCKING_OK, CKR_CANT_LOCK);
+		g_return_val_if_fail (args->flags & CKF_LIBRARY_CANT_CREATE_OS_THREADS, CKR_NEED_TO_CREATE_THREADS);
+	}
+
+	the_pin = g_strdup ("booo");
+	the_sessions = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, free_session);
+	the_objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)gkm_template_free);
+
+#if 0
+	/* Our token object */
+	attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_DATA,
+	                              CKA_LABEL, GP11_STRING, "TEST LABEL",
+	                              GP11_INVALID);
+	g_hash_table_insert (the_objects, GUINT_TO_POINTER (2), attrs);
+
+	/* Private capitalize key */
+	value = CKM_T_CAPITALIZE;
+	attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_PRIVATE_KEY,
+	                              CKA_LABEL, GP11_STRING, "Private Capitalize Key",
+	                              CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
+	                              CKA_DECRYPT, GP11_BOOLEAN, TRUE,
+	                              CKA_PRIVATE, GP11_BOOLEAN, TRUE,
+	                              CKA_WRAP, GP11_BOOLEAN, TRUE,
+	                              CKA_UNWRAP, GP11_BOOLEAN, TRUE,
+	                              CKA_DERIVE, GP11_BOOLEAN, TRUE,
+	                              CKA_VALUE, GP11_STRING, "value",
+	                              GP11_INVALID);
+	g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_CAPITALIZE), attrs);
+
+	/* Public capitalize key */
+	value = CKM_T_CAPITALIZE;
+	attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_PUBLIC_KEY,
+	                              CKA_LABEL, GP11_STRING, "Public Capitalize Key",
+	                              CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
+	                              CKA_ENCRYPT, GP11_BOOLEAN, TRUE,
+	                              CKA_PRIVATE, GP11_BOOLEAN, FALSE,
+	                              CKA_VALUE, GP11_STRING, "value",
+	                              GP11_INVALID);
+	g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_CAPITALIZE), attrs);
+
+	/* Private prefix key */
+	value = CKM_T_PREFIX;
+	attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_PRIVATE_KEY,
+	                              CKA_LABEL, GP11_STRING, "Private prefix key",
+	                              CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
+	                              CKA_SIGN, GP11_BOOLEAN, TRUE,
+	                              CKA_PRIVATE, GP11_BOOLEAN, TRUE,
+	                              CKA_ALWAYS_AUTHENTICATE, GP11_BOOLEAN, TRUE,
+	                              CKA_VALUE, GP11_STRING, "value",
+	                              GP11_INVALID);
+	g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_PREFIX), attrs);
+
+	/* Private prefix key */
+	value = CKM_T_PREFIX;
+	attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_PUBLIC_KEY,
+	                              CKA_LABEL, GP11_STRING, "Public prefix key",
+	                              CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
+	                              CKA_VERIFY, GP11_BOOLEAN, TRUE,
+	                              CKA_PRIVATE, GP11_BOOLEAN, FALSE,
+	                              CKA_VALUE, GP11_STRING, "value",
+	                              GP11_INVALID);
+	g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_PREFIX), attrs);
+#endif
+
+	initialized = TRUE;
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Finalize (CK_VOID_PTR pReserved)
+{
+	g_return_val_if_fail (pReserved == NULL, CKR_ARGUMENTS_BAD);
+	g_return_val_if_fail (initialized == TRUE, CKR_CRYPTOKI_NOT_INITIALIZED);
+
+	initialized = FALSE;
+	g_hash_table_destroy (the_objects);
+	the_objects = NULL;
+
+	g_hash_table_destroy (the_sessions);
+	the_sessions = NULL;
+
+	g_free (the_pin);
+	return CKR_OK;
+}
+
+static const CK_INFO TEST_INFO = {
+	{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR },
+	"TEST MANUFACTURER              ",
+	0,
+	"TEST LIBRARY                   ",
+	{ 45, 145 }
+};
+
+CK_RV
+gkm_test_C_GetInfo (CK_INFO_PTR pInfo)
+{
+	g_assert (pInfo != NULL && "Invalid pointer to GetInfo");
+	memcpy (pInfo, &TEST_INFO, sizeof (*pInfo));
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
+{
+	if (!list)
+		return CKR_ARGUMENTS_BAD;
+	*list = &functionList;
+	return CKR_OK;
+}
+
+/*
+ * Two slots
+ *  ONE: token present
+ *  TWO: token not present
+ */
+
+CK_RV
+gkm_test_C_GetSlotList (CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK_ULONG_PTR pulCount)
+{
+	CK_ULONG count;
+
+	g_assert (pulCount != NULL && "Invalid pulCount");
+
+	count = tokenPresent ? 1 : 2;
+
+	/* Application only wants to know the number of slots. */
+	if (pSlotList == NULL) {
+		*pulCount = count;
+		return CKR_OK;
+	}
+
+	if (*pulCount < count) {
+		g_assert (*pulCount && "Passed in a bad count");
+		return CKR_BUFFER_TOO_SMALL;
+	}
+
+	*pulCount = count;
+	pSlotList[0] = GKM_TEST_SLOT_ONE;
+	if (!tokenPresent)
+		pSlotList[1] = GKM_TEST_SLOT_TWO;
+
+	return CKR_OK;
+}
+
+static const CK_SLOT_INFO TEST_INFO_ONE = {
+	"TEST SLOT                                                       ",
+	"TEST MANUFACTURER              ",
+	CKF_TOKEN_PRESENT | CKF_REMOVABLE_DEVICE,
+	{ 55, 155 },
+	{ 65, 165 },
+};
+
+static const CK_SLOT_INFO TEST_INFO_TWO = {
+	"TEST SLOT                                                       ",
+	"TEST MANUFACTURER              ",
+	CKF_REMOVABLE_DEVICE,
+	{ 55, 155 },
+	{ 65, 165 },
+};
+
+CK_RV
+gkm_test_C_GetSlotInfo (CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo)
+{
+	g_assert (pInfo != NULL && "Invalid pInfo");
+
+	if (slotID == GKM_TEST_SLOT_ONE) {
+		memcpy (pInfo, &TEST_INFO_ONE, sizeof (*pInfo));
+		return CKR_OK;
+	} else if (slotID == GKM_TEST_SLOT_TWO) {
+		memcpy (pInfo, &TEST_INFO_TWO, sizeof (*pInfo));
+		return CKR_OK;
+	} else {
+		g_assert_not_reached (); /* "Invalid slot id" */
+		return CKR_SLOT_ID_INVALID;
+	}
+}
+
+static const CK_TOKEN_INFO TEST_TOKEN_ONE = {
+	"TEST LABEL                      ",
+	"TEST MANUFACTURER               ",
+	"TEST MODEL      ",
+	"TEST SERIAL     ",
+	CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_CLOCK_ON_TOKEN | CKF_TOKEN_INITIALIZED,
+	1,
+	2,
+	3,
+	4,
+	5,
+	6,
+	7,
+	8,
+	9,
+	10,
+	{ 75, 175 },
+	{ 85, 185 },
+	{ '1', '9', '9', '9', '0', '5', '2', '5', '0', '9', '1', '9', '5', '9', '0', '0' }
+};
+
+CK_RV
+gkm_test_C_GetTokenInfo (CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
+{
+	g_assert (pInfo != NULL && "Invalid pInfo");
+
+	if (slotID == GKM_TEST_SLOT_ONE) {
+		memcpy (pInfo, &TEST_TOKEN_ONE, sizeof (*pInfo));
+		return CKR_OK;
+	} else if (slotID == GKM_TEST_SLOT_TWO) {
+		return CKR_TOKEN_NOT_PRESENT;
+	} else {
+		g_assert_not_reached (); /* "Invalid slot id" */
+		return CKR_SLOT_ID_INVALID;
+	}
+}
+
+/*
+ * TWO mechanisms:
+ *  CKM_T_CAPITALIZE
+ *  CKM_T_PREFIX
+ */
+
+CK_RV
+gkm_test_C_GetMechanismList (CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMechanismList,
+                             CK_ULONG_PTR pulCount)
+{
+	g_assert (slotID == GKM_TEST_SLOT_ONE && "Invalid slotID");
+	g_assert (pulCount != NULL && "Invalid pulCount");
+
+	/* Application only wants to know the number of slots. */
+	if (pMechanismList == NULL) {
+		*pulCount = 2;
+		return CKR_OK;
+	}
+
+	if (*pulCount != 2) {
+		g_assert (*pulCount && "Passed in a bad count");
+		return CKR_BUFFER_TOO_SMALL;
+	}
+
+	pMechanismList[0] = CKM_T_CAPITALIZE;
+	pMechanismList[1] = CKM_T_PREFIX;
+	return CKR_OK;
+}
+
+static const CK_MECHANISM_INFO TEST_MECH_CAPITALIZE = {
+	512, 4096, 0
+};
+
+static const CK_MECHANISM_INFO TEST_MECH_PREFIX = {
+	2048, 2048, 0
+};
+
+CK_RV
+gkm_test_C_GetMechanismInfo (CK_SLOT_ID slotID, CK_MECHANISM_TYPE type,
+                             CK_MECHANISM_INFO_PTR pInfo)
+{
+	g_assert (slotID == GKM_TEST_SLOT_ONE && "Invalid slotID");
+	g_assert (pInfo != NULL && "Invalid pInfo");
+
+	if (type == CKM_T_CAPITALIZE) {
+		memcpy (pInfo, &TEST_MECH_CAPITALIZE, sizeof (*pInfo));
+		return CKR_OK;
+	} else if (type == CKM_T_PREFIX) {
+		memcpy (pInfo, &TEST_MECH_PREFIX, sizeof (*pInfo));
+		return CKR_OK;
+	} else {
+		g_assert_not_reached (); /* "Invalid type" */
+		return CKR_MECHANISM_INVALID;
+	}
+}
+
+CK_RV
+gkm_test_C_InitToken (CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulPinLen,
+                      CK_UTF8CHAR_PTR pLabel)
+{
+	g_assert (slotID == GKM_TEST_SLOT_ONE && "Invalid slotID");
+	g_assert (pPin != NULL && "Invalid pPin");
+	g_assert (strlen ("TEST PIN") && "Invalid ulPinLen");
+	g_assert (strncmp ((gchar*)pPin, "TEST PIN", ulPinLen) == 0 && "Invalid pPin string");
+	g_assert (pLabel != NULL && "Invalid pLabel");
+	g_assert (strcmp ((gchar*)pPin, "TEST LABEL") == 0 && "Invalid pLabel string");
+
+	g_free (the_pin);
+	the_pin = g_strndup ((gchar*)pPin, ulPinLen);
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_WaitForSlotEvent (CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_PTR pReserved)
+{
+	g_assert_not_reached (); /* Not yet used by library */
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_OpenSession (CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication,
+                        CK_NOTIFY Notify, CK_SESSION_HANDLE_PTR phSession)
+{
+	Session *sess;
+
+	g_return_val_if_fail (slotID == GKM_TEST_SLOT_ONE, CKR_SLOT_ID_INVALID);
+	g_return_val_if_fail (phSession != NULL, CKR_ARGUMENTS_BAD);
+	g_return_val_if_fail ((flags & CKF_SERIAL_SESSION) == CKF_SERIAL_SESSION, CKR_SESSION_PARALLEL_NOT_SUPPORTED);
+
+	sess = g_new0 (Session, 1);
+	sess->handle = ++unique_identifier;
+	sess->info.flags = flags;
+	sess->info.slotID = slotID;
+	sess->info.state = 0;
+	sess->info.ulDeviceError = 1414;
+	sess->objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)gkm_template_free);
+	*phSession = sess->handle;
+
+	g_hash_table_replace (the_sessions, GUINT_TO_POINTER (sess->handle), sess);
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_CloseSession (CK_SESSION_HANDLE hSession)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	g_hash_table_remove (the_sessions, GUINT_TO_POINTER (hSession));
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_CloseAllSessions (CK_SLOT_ID slotID)
+{
+	g_assert (slotID == GKM_TEST_SLOT_ONE && "Invalid slotID");
+
+	g_hash_table_remove_all (the_sessions);
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_GetFunctionStatus (CK_SESSION_HANDLE hSession)
+{
+	return CKR_FUNCTION_NOT_PARALLEL;
+}
+
+CK_RV
+gkm_test_C_CancelFunction (CK_SESSION_HANDLE hSession)
+{
+	return CKR_FUNCTION_NOT_PARALLEL;
+}
+
+CK_RV
+gkm_test_C_GetSessionInfo (CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR pInfo)
+{
+	Session *session;
+
+	g_assert (pInfo != NULL && "Invalid pInfo");
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	memcpy (pInfo, &session->info, sizeof (*pInfo));
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_InitPIN (CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin,
+                    CK_ULONG ulPinLen)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	g_free (the_pin);
+	the_pin = g_strndup ((gchar*)pPin, ulPinLen);
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_SetPIN (CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin,
+                   CK_ULONG ulOldLen, CK_UTF8CHAR_PTR pNewPin, CK_ULONG ulNewLen)
+{
+	Session *session;
+	gchar *old;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	old = g_strndup ((gchar*)pOldPin, ulOldLen);
+	if (!g_str_equal (old, the_pin))
+		return CKR_PIN_INCORRECT;
+
+	g_free (the_pin);
+	the_pin = g_strndup ((gchar*)pNewPin, ulNewLen);
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_GetOperationState (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOperationState,
+                              CK_ULONG_PTR pulOperationStateLen)
+{
+	g_assert_not_reached (); /* Not yet used by library */
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SetOperationState (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOperationState,
+                              CK_ULONG ulOperationStateLen, CK_OBJECT_HANDLE hEncryptionKey,
+                              CK_OBJECT_HANDLE hAuthenticationKey)
+{
+	g_assert_not_reached (); /* Not yet used by library */
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_Login (CK_SESSION_HANDLE hSession, CK_USER_TYPE userType,
+                  CK_UTF8CHAR_PTR pPin, CK_ULONG pPinLen)
+{
+	Session *session;
+
+	g_return_val_if_fail (userType == CKU_SO ||
+	                      userType == CKU_USER ||
+	                      userType == CKU_CONTEXT_SPECIFIC,
+	                      CKR_USER_TYPE_INVALID);
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_return_val_if_fail (session != NULL, CKR_SESSION_HANDLE_INVALID);
+	g_return_val_if_fail (logged_in == FALSE, CKR_USER_ALREADY_LOGGED_IN);
+
+	if (!pPin)
+		return CKR_PIN_INCORRECT;
+
+	if (pPinLen != strlen (the_pin))
+		return CKR_PIN_INCORRECT;
+	if (strncmp ((gchar*)pPin, the_pin, pPinLen) != 0)
+		return CKR_PIN_INCORRECT;
+
+	if (userType == CKU_CONTEXT_SPECIFIC) {
+		session->want_context_login = CK_FALSE;
+	} else {
+		logged_in = TRUE;
+		user_type = userType;
+	}
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Logout (CK_SESSION_HANDLE hSession)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	g_assert (logged_in && "Not logged in");
+	logged_in = FALSE;
+	user_type = 0;
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_CreateObject (CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
+                         CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phObject)
+{
+	GArray *attrs;
+	Session *session;
+	gboolean token, priv;
+
+	g_assert (phObject != NULL);
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	attrs = gkm_template_new (pTemplate, ulCount);
+
+	if (gkm_template_find_boolean (attrs, CKA_PRIVATE, &priv) && priv) {
+		if (!logged_in) {
+			gkm_template_free (attrs);
+			return CKR_USER_NOT_LOGGED_IN;
+		}
+	}
+
+	*phObject = ++unique_identifier;
+	if (gkm_template_find_boolean (attrs, CKA_TOKEN, &token) && token)
+		g_hash_table_insert (the_objects, GUINT_TO_POINTER (*phObject), attrs);
+	else
+		g_hash_table_insert (session->objects, GUINT_TO_POINTER (*phObject), attrs);
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_CopyObject (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
+                       CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount,
+                       CK_OBJECT_HANDLE_PTR phNewObject)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DestroyObject (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
+{
+	GArray *attrs;
+	Session *session;
+	gboolean priv;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	attrs = lookup_object (session, hObject);
+	if (!attrs) {
+		g_assert_not_reached (); /* "no such object found" */
+		return CKR_OBJECT_HANDLE_INVALID;
+	}
+
+	if (gkm_template_find_boolean (attrs, CKA_PRIVATE, &priv) && priv) {
+		if (!logged_in)
+			return CKR_USER_NOT_LOGGED_IN;
+	}
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_GetObjectSize (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
+                          CK_ULONG_PTR pulSize)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_GetAttributeValue (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
+                              CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount)
+{
+	CK_ATTRIBUTE_PTR result;
+	CK_RV ret = CKR_OK;
+	GArray *attrs;
+	CK_ATTRIBUTE_PTR attr;
+	Session *session;
+	CK_ULONG i;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	attrs = lookup_object (session, hObject);
+	if (!attrs) {
+		g_assert_not_reached (); /* "invalid object handle passed" */
+		return CKR_OBJECT_HANDLE_INVALID;
+	}
+
+	for (i = 0; i < ulCount; ++i) {
+		result = pTemplate + i;
+		attr = gkm_template_find (attrs, result->type);
+		if (!attr) {
+			result->ulValueLen = (CK_ULONG)-1;
+			ret = CKR_ATTRIBUTE_TYPE_INVALID;
+			continue;
+		}
+
+		if (!result->pValue) {
+			result->ulValueLen = attr->ulValueLen;
+			continue;
+		}
+
+		if (result->ulValueLen >= attr->ulValueLen) {
+			memcpy (result->pValue, attr->pValue, attr->ulValueLen);
+			continue;
+		}
+
+		result->ulValueLen = (CK_ULONG)-1;
+		ret = CKR_BUFFER_TOO_SMALL;
+	}
+
+	return ret;
+}
+
+CK_RV
+gkm_test_C_SetAttributeValue (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
+                              CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount)
+{
+	Session *session;
+	GArray *attrs;
+	CK_ULONG i;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	attrs = lookup_object (session, hObject);
+	if (!attrs) {
+		g_assert_not_reached (); /* "invalid object handle passed" */
+		return CKR_OBJECT_HANDLE_INVALID;
+	}
+
+	for (i = 0; i < ulCount; ++i)
+		gkm_template_set (attrs, pTemplate + i);
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_FindObjectsInit (CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
+                            CK_ULONG ulCount)
+{
+	GHashTableIter iter;
+	GArray *attrs;
+	CK_ATTRIBUTE_PTR attr;
+	CK_ATTRIBUTE_PTR match;
+	Session *session;
+	gpointer key, value;
+	gboolean matched = TRUE;
+	CK_ULONG i;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	/* Starting an operation, cancels any previous one */
+	if (session->operation != 0)
+		session->operation = 0;
+
+	session->operation = OP_FIND;
+
+	/* Token objects */
+	g_hash_table_iter_init (&iter, the_objects);
+	while (g_hash_table_iter_next (&iter, &key, &value)) {
+		attrs = (GArray*)value;
+		matched = TRUE;
+		for (i = 0; i < ulCount; ++i) {
+			match = pTemplate + i;
+			attr = gkm_template_find (attrs, match->type);
+			if (!attr) {
+				matched = FALSE;
+				break;
+			}
+
+			if (attr->ulValueLen != match->ulValueLen ||
+			    memcmp (attr->pValue, match->pValue, attr->ulValueLen) != 0) {
+				matched = FALSE;
+				break;
+			}
+		}
+
+		if (matched)
+			session->matches = g_list_prepend (session->matches, key);
+	}
+
+	/* session objects */
+	g_hash_table_iter_init (&iter, session->objects);
+	while (g_hash_table_iter_next (&iter, &key, &value)) {
+		attrs = (GArray*)value;
+		matched = TRUE;
+		for (i = 0; i < ulCount; ++i) {
+			match = pTemplate + i;
+			attr = gkm_template_find (attrs, match->type);
+			if (!attr) {
+				matched = FALSE;
+				break;
+			}
+
+			if (attr->ulValueLen != match->ulValueLen ||
+			    memcmp (attr->pValue, match->pValue, attr->ulValueLen) != 0) {
+				matched = FALSE;
+				break;
+			}
+		}
+
+		if (matched)
+			session->matches = g_list_prepend (session->matches, key);
+	}
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_FindObjects (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject,
+                        CK_ULONG ulMaxObjectCount, CK_ULONG_PTR pulObjectCount)
+{
+	Session *session;
+
+	g_assert (phObject != NULL);
+	g_assert (pulObjectCount != NULL);
+	g_assert (ulMaxObjectCount != 0);
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_FIND) {
+		g_assert_not_reached (); /* "invalid call to FindObjects" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	*pulObjectCount = 0;
+	while (ulMaxObjectCount > 0 && session->matches) {
+		*phObject = GPOINTER_TO_UINT (session->matches->data);
+		++phObject;
+		--ulMaxObjectCount;
+		++(*pulObjectCount);
+		session->matches = g_list_remove (session->matches, session->matches->data);
+	}
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_FindObjectsFinal (CK_SESSION_HANDLE hSession)
+{
+
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_FIND) {
+		g_assert_not_reached (); /* "invalid call to FindObjectsFinal" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	session->operation = 0;
+	g_list_free (session->matches);
+	session->matches = NULL;
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_EncryptInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                        CK_OBJECT_HANDLE hKey)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	/* Starting an operation, cancels any previous one */
+	if (session->operation != 0)
+		session->operation = 0;
+
+	g_assert (pMechanism);
+	g_assert (pMechanism->mechanism == CKM_T_CAPITALIZE);
+	g_assert (hKey == PUBLIC_KEY_CAPITALIZE);
+
+	session->operation = OP_CRYPTO;
+	session->crypto_method = CKA_ENCRYPT;
+	session->crypto_mechanism = CKM_T_CAPITALIZE;
+	session->crypto_key = hKey;
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Encrypt (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen,
+                    CK_BYTE_PTR pEncryptedData, CK_ULONG_PTR pulEncryptedDataLen)
+{
+	Session *session;
+	CK_ULONG i;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_CRYPTO) {
+		g_assert_not_reached (); /* "invalid call to Encrypt" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	g_assert (pData);
+	g_assert (pulEncryptedDataLen);
+	g_assert (session->crypto_method == CKA_ENCRYPT);
+	g_assert (session->crypto_mechanism == CKM_T_CAPITALIZE);
+	g_assert (session->crypto_key == PUBLIC_KEY_CAPITALIZE);
+
+	if (!pEncryptedData) {
+		*pulEncryptedDataLen = ulDataLen;
+		return CKR_OK;
+	}
+
+	if (*pulEncryptedDataLen < ulDataLen) {
+		*pulEncryptedDataLen = ulDataLen;
+		return CKR_BUFFER_TOO_SMALL;
+	}
+
+	for (i = 0; i < ulDataLen; ++i)
+		pEncryptedData[i] = g_ascii_toupper (pData[i]);
+	*pulEncryptedDataLen = ulDataLen;
+
+	session->operation = 0;
+	session->crypto_method = 0;
+	session->crypto_mechanism = 0;
+	session->crypto_key = 0;
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_EncryptUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
+                          CK_ULONG ulPartLen, CK_BYTE_PTR pEncryptedPart,
+                          CK_ULONG_PTR pulEncryptedPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_EncryptFinal (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pLastEncryptedPart,
+                         CK_ULONG_PTR pulLastEncryptedPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DecryptInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                        CK_OBJECT_HANDLE hKey)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	/* Starting an operation, cancels any previous one */
+	if (session->operation != 0)
+		session->operation = 0;
+
+	g_assert (pMechanism);
+	g_assert (pMechanism->mechanism == CKM_T_CAPITALIZE);
+	g_assert (hKey == PRIVATE_KEY_CAPITALIZE);
+
+	session->operation = OP_CRYPTO;
+	session->crypto_method = CKA_DECRYPT;
+	session->crypto_mechanism = CKM_T_CAPITALIZE;
+	session->crypto_key = hKey;
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Decrypt (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData,
+                    CK_ULONG ulEncryptedDataLen, CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen)
+{
+	Session *session;
+	CK_ULONG i;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_CRYPTO) {
+		g_assert_not_reached (); /* "invalid call to Encrypt" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	g_assert (pEncryptedData);
+	g_assert (pulDataLen);
+	g_assert (session->crypto_method == CKA_DECRYPT);
+	g_assert (session->crypto_mechanism == CKM_T_CAPITALIZE);
+	g_assert (session->crypto_key == PRIVATE_KEY_CAPITALIZE);
+
+	if (!pData) {
+		*pulDataLen = ulEncryptedDataLen;
+		return CKR_OK;
+	}
+
+	if (*pulDataLen < ulEncryptedDataLen) {
+		*pulDataLen = ulEncryptedDataLen;
+		return CKR_BUFFER_TOO_SMALL;
+	}
+
+	for (i = 0; i < ulEncryptedDataLen; ++i)
+		pData[i] = g_ascii_tolower (pEncryptedData[i]);
+	*pulDataLen = ulEncryptedDataLen;
+
+	session->operation = 0;
+	session->crypto_method = 0;
+	session->crypto_mechanism = 0;
+	session->crypto_key = 0;
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_DecryptUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedPart,
+                          CK_ULONG ulEncryptedPartLen, CK_BYTE_PTR pPart, CK_ULONG_PTR pulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DecryptFinal (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pLastPart,
+                         CK_ULONG_PTR pulLastPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DigestInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_Digest (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen,
+                   CK_BYTE_PTR pDigest, CK_ULONG_PTR pulDigestLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DigestUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ULONG ulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DigestKey (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DigestFinal (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest,
+                        CK_ULONG_PTR pulDigestLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SignInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                     CK_OBJECT_HANDLE hKey)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	/* Starting an operation, cancels any previous one */
+	if (session->operation != 0)
+		session->operation = 0;
+
+	g_assert (pMechanism);
+	g_assert (pMechanism->mechanism == CKM_T_PREFIX);
+	g_assert (hKey == PRIVATE_KEY_PREFIX);
+
+	session->operation = OP_CRYPTO;
+	session->crypto_method = CKA_SIGN;
+	session->crypto_mechanism = CKM_T_PREFIX;
+	session->crypto_key = hKey;
+
+	if (pMechanism->pParameter) {
+		g_assert (pMechanism->ulParameterLen < sizeof (session->sign_prefix));
+		memcpy (session->sign_prefix, pMechanism->pParameter, pMechanism->ulParameterLen);
+		session->n_sign_prefix = pMechanism->ulParameterLen;
+	} else {
+		g_assert (strlen (SIGNED_PREFIX) + 1 < sizeof (session->sign_prefix));
+		strcpy ((gchar*)session->sign_prefix, SIGNED_PREFIX);
+		session->n_sign_prefix = strlen (SIGNED_PREFIX);
+	}
+
+	/* The private key has CKA_ALWAYS_AUTHENTICATE above */
+	session->want_context_login = CK_TRUE;
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Sign (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen,
+                 CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen)
+{
+	Session *session;
+	CK_ULONG length;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_CRYPTO) {
+		g_assert_not_reached (); /* "invalid call to Encrypt" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	if (session->want_context_login)
+		return CKR_USER_NOT_LOGGED_IN;
+
+	g_assert (pData);
+	g_assert (pulSignatureLen);
+	g_assert (session->crypto_method == CKA_SIGN);
+	g_assert (session->crypto_mechanism == CKM_T_PREFIX);
+	g_assert (session->crypto_key == PRIVATE_KEY_PREFIX);
+
+	length = session->n_sign_prefix + ulDataLen;
+
+	if (!pSignature) {
+		*pulSignatureLen = length;
+		return CKR_OK;
+	}
+
+	if (*pulSignatureLen < length) {
+		*pulSignatureLen = length;
+		return CKR_BUFFER_TOO_SMALL;
+	}
+
+	memcpy (pSignature, session->sign_prefix, session->n_sign_prefix);
+	memcpy (pSignature + session->n_sign_prefix, pData, ulDataLen);
+	*pulSignatureLen = length;
+
+	session->operation = 0;
+	session->crypto_method = 0;
+	session->crypto_mechanism = 0;
+	session->crypto_key = 0;
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_SignUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ULONG ulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SignFinal (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
+                      CK_ULONG_PTR pulSignatureLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SignRecoverInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                            CK_OBJECT_HANDLE hKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SignRecover (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen,
+                        CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_VerifyInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                       CK_OBJECT_HANDLE hKey)
+{
+	Session *session;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	/* Starting an operation, cancels any previous one */
+	if (session->operation != 0)
+		session->operation = 0;
+
+	g_assert (pMechanism);
+	g_assert (pMechanism->mechanism == CKM_T_PREFIX);
+	g_assert (hKey == PUBLIC_KEY_PREFIX);
+
+	session->operation = OP_CRYPTO;
+	session->crypto_method = CKA_VERIFY;
+	session->crypto_mechanism = CKM_T_PREFIX;
+	session->crypto_key = hKey;
+
+	if (pMechanism->pParameter) {
+		g_assert (pMechanism->ulParameterLen < sizeof (session->sign_prefix));
+		memcpy (session->sign_prefix, pMechanism->pParameter, pMechanism->ulParameterLen);
+		session->n_sign_prefix = pMechanism->ulParameterLen;
+	} else {
+		g_assert (strlen (SIGNED_PREFIX) + 1 < sizeof (session->sign_prefix));
+		strcpy ((gchar*)session->sign_prefix, SIGNED_PREFIX);
+		session->n_sign_prefix = strlen (SIGNED_PREFIX);
+	}
+
+	return CKR_OK;
+}
+
+CK_RV
+gkm_test_C_Verify (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen,
+                   CK_BYTE_PTR pSignature, CK_ULONG ulSignatureLen)
+{
+	Session *session;
+	CK_ULONG length;
+
+	session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
+	g_assert (session != NULL && "No such session found");
+	if (!session)
+		return CKR_SESSION_HANDLE_INVALID;
+
+	if (session->operation != OP_CRYPTO) {
+		g_assert_not_reached (); /* "invalid call to Encrypt" */
+		return CKR_OPERATION_NOT_INITIALIZED;
+	}
+
+	g_assert (pData);
+	g_assert (pSignature);
+	g_assert (session->crypto_method == CKA_VERIFY);
+	g_assert (session->crypto_mechanism == CKM_T_PREFIX);
+	g_assert (session->crypto_key == PUBLIC_KEY_PREFIX);
+
+	length = session->n_sign_prefix + ulDataLen;
+
+	if (ulSignatureLen < length) {
+		g_assert (FALSE);
+		return CKR_SIGNATURE_LEN_RANGE;
+	}
+
+	if (memcmp (pSignature, session->sign_prefix, session->n_sign_prefix) == 0 &&
+	    memcmp (pSignature + session->n_sign_prefix, pData, ulDataLen) == 0)
+		return CKR_OK;
+
+	return CKR_SIGNATURE_INVALID;
+}
+
+CK_RV
+gkm_test_C_VerifyUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ULONG ulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_VerifyFinal (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
+                        CK_ULONG pulSignatureLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_VerifyRecoverInit (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                              CK_OBJECT_HANDLE hKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_VerifyRecover (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
+                          CK_ULONG pulSignatureLen, CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DigestEncryptUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
+                                CK_ULONG ulPartLen, CK_BYTE_PTR pEncryptedPart,
+                                CK_ULONG_PTR ulEncryptedPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DecryptDigestUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedPart,
+                                CK_ULONG ulEncryptedPartLen, CK_BYTE_PTR pPart,
+                                CK_ULONG_PTR pulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SignEncryptUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
+                              CK_ULONG ulPartLen, CK_BYTE_PTR pEncryptedPart,
+                              CK_ULONG_PTR ulEncryptedPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DecryptVerifyUpdate (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedPart,
+                                CK_ULONG ulEncryptedPartLen, CK_BYTE_PTR pPart,
+                                CK_ULONG_PTR pulPartLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_GenerateKey (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                        CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount,
+                        CK_OBJECT_HANDLE_PTR phKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_GenerateKeyPair (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                            CK_ATTRIBUTE_PTR pPublicKeyTemplate, CK_ULONG ulPublicKeyAttributeCount,
+                            CK_ATTRIBUTE_PTR pPrivateKeyTemplate, CK_ULONG ulPrivateKeyAttributeCount,
+                            CK_OBJECT_HANDLE_PTR phPublicKey, CK_OBJECT_HANDLE_PTR phPrivateKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_WrapKey (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                    CK_OBJECT_HANDLE hWrappingKey, CK_OBJECT_HANDLE hKey,
+                    CK_BYTE_PTR pWrappedKey, CK_ULONG_PTR pulWrappedKeyLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_UnwrapKey (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                      CK_OBJECT_HANDLE pUnwrappingKey, CK_BYTE_PTR pWrappedKey,
+                      CK_ULONG pulWrappedKeyLen, CK_ATTRIBUTE_PTR pTemplate,
+                      CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_DeriveKey (CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                      CK_OBJECT_HANDLE hBaseKey, CK_ATTRIBUTE_PTR pTemplate,
+                      CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phKey)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_SeedRandom (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_ULONG ulSeedLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV
+gkm_test_C_GenerateRandom (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomData,
+                           CK_ULONG ulRandomLen)
+{
+	return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+static CK_FUNCTION_LIST functionList = {
+	{ 2, 11 },	/* version */
+	gkm_test_C_Initialize,
+	gkm_test_C_Finalize,
+	gkm_test_C_GetInfo,
+	gkm_test_C_GetFunctionList,
+	gkm_test_C_GetSlotList,
+	gkm_test_C_GetSlotInfo,
+	gkm_test_C_GetTokenInfo,
+	gkm_test_C_GetMechanismList,
+	gkm_test_C_GetMechanismInfo,
+	gkm_test_C_InitToken,
+	gkm_test_C_InitPIN,
+	gkm_test_C_SetPIN,
+	gkm_test_C_OpenSession,
+	gkm_test_C_CloseSession,
+	gkm_test_C_CloseAllSessions,
+	gkm_test_C_GetSessionInfo,
+	gkm_test_C_GetOperationState,
+	gkm_test_C_SetOperationState,
+	gkm_test_C_Login,
+	gkm_test_C_Logout,
+	gkm_test_C_CreateObject,
+	gkm_test_C_CopyObject,
+	gkm_test_C_DestroyObject,
+	gkm_test_C_GetObjectSize,
+	gkm_test_C_GetAttributeValue,
+	gkm_test_C_SetAttributeValue,
+	gkm_test_C_FindObjectsInit,
+	gkm_test_C_FindObjects,
+	gkm_test_C_FindObjectsFinal,
+	gkm_test_C_EncryptInit,
+	gkm_test_C_Encrypt,
+	gkm_test_C_EncryptUpdate,
+	gkm_test_C_EncryptFinal,
+	gkm_test_C_DecryptInit,
+	gkm_test_C_Decrypt,
+	gkm_test_C_DecryptUpdate,
+	gkm_test_C_DecryptFinal,
+	gkm_test_C_DigestInit,
+	gkm_test_C_Digest,
+	gkm_test_C_DigestUpdate,
+	gkm_test_C_DigestKey,
+	gkm_test_C_DigestFinal,
+	gkm_test_C_SignInit,
+	gkm_test_C_Sign,
+	gkm_test_C_SignUpdate,
+	gkm_test_C_SignFinal,
+	gkm_test_C_SignRecoverInit,
+	gkm_test_C_SignRecover,
+	gkm_test_C_VerifyInit,
+	gkm_test_C_Verify,
+	gkm_test_C_VerifyUpdate,
+	gkm_test_C_VerifyFinal,
+	gkm_test_C_VerifyRecoverInit,
+	gkm_test_C_VerifyRecover,
+	gkm_test_C_DigestEncryptUpdate,
+	gkm_test_C_DecryptDigestUpdate,
+	gkm_test_C_SignEncryptUpdate,
+	gkm_test_C_DecryptVerifyUpdate,
+	gkm_test_C_GenerateKey,
+	gkm_test_C_GenerateKeyPair,
+	gkm_test_C_WrapKey,
+	gkm_test_C_UnwrapKey,
+	gkm_test_C_DeriveKey,
+	gkm_test_C_SeedRandom,
+	gkm_test_C_GenerateRandom,
+	gkm_test_C_GetFunctionStatus,
+	gkm_test_C_CancelFunction,
+	gkm_test_C_WaitForSlotEvent
+};
diff --git a/pkcs11/gkm/gkm-test.h b/pkcs11/gkm/gkm-test.h
new file mode 100644
index 0000000..993d86c
--- /dev/null
+++ b/pkcs11/gkm/gkm-test.h
@@ -0,0 +1,380 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2010 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <glib.h>
+
+#include "pkcs11/pkcs11.h"
+
+#ifndef TESTMODULE_H_
+#define TESTMODULE_H_
+
+#define         gkm_assert_cmprv(v1, cmp, v2) \
+		do { CK_RV __v1 = (v1), __v2 = (v2); \
+			if (__v1 cmp __v2) ; else \
+				gkm_assertion_message_cmprv (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
+				                           #v1 " " #cmp " " #v2, __v1, #cmp, __v2); \
+		} while (0)
+
+void            gkm_assertion_message_cmprv        (const gchar *domain,
+                                                    const gchar *file,
+                                                    int line,
+                                                    const gchar *func,
+                                                    const gchar *expr,
+                                                    CK_RV arg1,
+                                                    const gchar *cmp,
+                                                    CK_RV arg2);
+
+CK_RV           gkm_test_C_Initialize              (CK_VOID_PTR pInitArgs);
+
+CK_RV           gkm_test_C_Finalize                (CK_VOID_PTR pReserved);
+
+CK_RV           gkm_test_C_GetInfo                 (CK_INFO_PTR pInfo);
+
+CK_RV           gkm_test_C_GetFunctionList         (CK_FUNCTION_LIST_PTR_PTR list);
+
+CK_RV           gkm_test_C_GetSlotList             (CK_BBOOL tokenPresent,
+                                                    CK_SLOT_ID_PTR pSlotList,
+                                                    CK_ULONG_PTR pulCount);
+
+CK_RV           gkm_test_C_GetSlotInfo             (CK_SLOT_ID slotID,
+                                                    CK_SLOT_INFO_PTR pInfo);
+
+CK_RV           gkm_test_C_GetTokenInfo            (CK_SLOT_ID slotID,
+                                                    CK_TOKEN_INFO_PTR pInfo);
+
+CK_RV           gkm_test_C_GetMechanismList        (CK_SLOT_ID slotID,
+                                                    CK_MECHANISM_TYPE_PTR pMechanismList,
+                                                    CK_ULONG_PTR pulCount);
+
+CK_RV           gkm_test_C_GetMechanismInfo        (CK_SLOT_ID slotID,
+                                                    CK_MECHANISM_TYPE type,
+                                                    CK_MECHANISM_INFO_PTR pInfo);
+
+CK_RV           gkm_test_C_InitToken               (CK_SLOT_ID slotID,
+                                                    CK_UTF8CHAR_PTR pPin,
+                                                    CK_ULONG ulPinLen,
+                                                    CK_UTF8CHAR_PTR pLabel);
+
+CK_RV           gkm_test_C_WaitForSlotEvent        (CK_FLAGS flags,
+                                                    CK_SLOT_ID_PTR pSlot,
+                                                    CK_VOID_PTR pReserved);
+
+CK_RV           gkm_test_C_OpenSession             (CK_SLOT_ID slotID,
+                                                    CK_FLAGS flags,
+                                                    CK_VOID_PTR pApplication,
+                                                    CK_NOTIFY Notify,
+                                                    CK_SESSION_HANDLE_PTR phSession);
+
+CK_RV           gkm_test_C_CloseSession            (CK_SESSION_HANDLE hSession);
+
+CK_RV           gkm_test_C_CloseAllSessions        (CK_SLOT_ID slotID);
+
+CK_RV           gkm_test_C_GetFunctionStatus       (CK_SESSION_HANDLE hSession);
+
+CK_RV           gkm_test_C_CancelFunction          (CK_SESSION_HANDLE hSession);
+
+CK_RV           gkm_test_C_GetSessionInfo          (CK_SESSION_HANDLE hSession,
+                                                    CK_SESSION_INFO_PTR pInfo);
+
+CK_RV           gkm_test_C_InitPIN                 (CK_SESSION_HANDLE hSession,
+                                                    CK_UTF8CHAR_PTR pPin,
+                                                    CK_ULONG ulPinLen);
+
+CK_RV           gkm_test_C_SetPIN                  (CK_SESSION_HANDLE hSession,
+                                                    CK_UTF8CHAR_PTR pOldPin,
+                                                    CK_ULONG ulOldLen,
+                                                    CK_UTF8CHAR_PTR pNewPin,
+                                                    CK_ULONG ulNewLen);
+
+CK_RV           gkm_test_C_GetOperationState       (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pOperationState,
+                                                    CK_ULONG_PTR pulOperationStateLen);
+
+CK_RV           gkm_test_C_SetOperationState       (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pOperationState,
+                                                    CK_ULONG ulOperationStateLen,
+                                                    CK_OBJECT_HANDLE hEncryptionKey,
+                                                    CK_OBJECT_HANDLE hAuthenticationKey);
+
+CK_RV           gkm_test_C_Login                   (CK_SESSION_HANDLE hSession,
+                                                    CK_USER_TYPE userType,
+                                                    CK_UTF8CHAR_PTR pPin,
+                                                    CK_ULONG pPinLen);
+
+CK_RV           gkm_test_C_Logout                  (CK_SESSION_HANDLE hSession);
+
+CK_RV           gkm_test_C_CreateObject            (CK_SESSION_HANDLE hSession,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount,
+                                                    CK_OBJECT_HANDLE_PTR phObject);
+
+CK_RV           gkm_test_C_CopyObject              (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hObject,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount,
+                                                    CK_OBJECT_HANDLE_PTR phNewObject);
+
+CK_RV           gkm_test_C_DestroyObject           (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hObject);
+
+CK_RV           gkm_test_C_GetObjectSize           (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hObject,
+                                                    CK_ULONG_PTR pulSize);
+
+CK_RV           gkm_test_C_GetAttributeValue       (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hObject,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount);
+
+CK_RV           gkm_test_C_SetAttributeValue       (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hObject,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount);
+
+CK_RV           gkm_test_C_FindObjectsInit         (CK_SESSION_HANDLE hSession,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount);
+
+CK_RV           gkm_test_C_FindObjects             (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE_PTR phObject,
+                                                    CK_ULONG ulMaxObjectCount,
+                                                    CK_ULONG_PTR pulObjectCount);
+
+CK_RV           gkm_test_C_FindObjectsFinal        (CK_SESSION_HANDLE hSession);
+
+CK_RV           gkm_test_C_EncryptInit             (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_Encrypt                 (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG ulDataLen,
+                                                    CK_BYTE_PTR pEncryptedData,
+                                                    CK_ULONG_PTR pulEncryptedDataLen);
+
+CK_RV           gkm_test_C_EncryptUpdate           (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG_PTR pulEncryptedPartLen);
+
+CK_RV           gkm_test_C_EncryptFinal            (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pLastEncryptedPart,
+                                                    CK_ULONG_PTR pulLastEncryptedPartLen);
+
+CK_RV           gkm_test_C_DecryptInit             (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_Decrypt                 (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pEncryptedData,
+                                                    CK_ULONG ulEncryptedDataLen,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG_PTR pulDataLen);
+
+CK_RV           gkm_test_C_DecryptUpdate           (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG ulEncryptedPartLen,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG_PTR pulPartLen);
+
+CK_RV           gkm_test_C_DecryptFinal            (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pLastPart,
+                                                    CK_ULONG_PTR pulLastPartLen);
+
+CK_RV           gkm_test_C_DigestInit              (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism);
+
+CK_RV           gkm_test_C_Digest                  (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG ulDataLen,
+                                                    CK_BYTE_PTR pDigest,
+                                                    CK_ULONG_PTR pulDigestLen);
+
+CK_RV           gkm_test_C_DigestUpdate            (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen);
+
+CK_RV           gkm_test_C_DigestKey               (CK_SESSION_HANDLE hSession,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_DigestFinal             (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pDigest,
+                                                    CK_ULONG_PTR pulDigestLen);
+
+CK_RV           gkm_test_C_SignInit                (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_Sign                    (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG ulDataLen,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG_PTR pulSignatureLen);
+
+CK_RV           gkm_test_C_SignUpdate              (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen);
+
+CK_RV           gkm_test_C_SignFinal               (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG_PTR pulSignatureLen);
+
+CK_RV           gkm_test_C_SignRecoverInit         (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_SignRecover             (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG ulDataLen,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG_PTR pulSignatureLen);
+
+CK_RV           gkm_test_C_VerifyInit              (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_Verify                  (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG ulDataLen,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG ulSignatureLen);
+
+CK_RV           gkm_test_C_VerifyUpdate            (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen);
+
+CK_RV           gkm_test_C_VerifyFinal             (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG pulSignatureLen);
+
+CK_RV           gkm_test_C_VerifyRecoverInit       (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hKey);
+
+CK_RV           gkm_test_C_VerifyRecover           (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pSignature,
+                                                    CK_ULONG pulSignatureLen,
+                                                    CK_BYTE_PTR pData,
+                                                    CK_ULONG_PTR pulDataLen);
+
+CK_RV           gkm_test_C_DigestEncryptUpdate     (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG_PTR ulEncryptedPartLen);
+
+CK_RV           gkm_test_C_DecryptDigestUpdate     (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG ulEncryptedPartLen,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG_PTR pulPartLen);
+
+CK_RV           gkm_test_C_SignEncryptUpdate       (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG ulPartLen,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG_PTR ulEncryptedPartLen);
+
+CK_RV           gkm_test_C_DecryptVerifyUpdate     (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pEncryptedPart,
+                                                    CK_ULONG ulEncryptedPartLen,
+                                                    CK_BYTE_PTR pPart,
+                                                    CK_ULONG_PTR pulPartLen);
+
+CK_RV           gkm_test_C_GenerateKey             (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount,
+                                                    CK_OBJECT_HANDLE_PTR phKey);
+
+CK_RV           gkm_test_C_GenerateKeyPair         (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_ATTRIBUTE_PTR pPublicKeyTemplate,
+                                                    CK_ULONG ulPublicKeyAttributeCount,
+                                                    CK_ATTRIBUTE_PTR pPrivateKeyTemplate,
+                                                    CK_ULONG ulPrivateKeyAttributeCount,
+                                                    CK_OBJECT_HANDLE_PTR phPublicKey,
+                                                    CK_OBJECT_HANDLE_PTR phPrivateKey);
+
+CK_RV           gkm_test_C_WrapKey                 (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hWrappingKey,
+                                                    CK_OBJECT_HANDLE hKey,
+                                                    CK_BYTE_PTR pWrappedKey,
+                                                    CK_ULONG_PTR pulWrappedKeyLen);
+
+CK_RV           gkm_test_C_UnwrapKey               (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE pUnwrappingKey,
+                                                    CK_BYTE_PTR pWrappedKey,
+                                                    CK_ULONG pulWrappedKeyLen,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount,
+                                                    CK_OBJECT_HANDLE_PTR phKey);
+
+CK_RV           gkm_test_C_DeriveKey               (CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_OBJECT_HANDLE hBaseKey,
+                                                    CK_ATTRIBUTE_PTR pTemplate,
+                                                    CK_ULONG ulCount,
+                                                    CK_OBJECT_HANDLE_PTR phKey);
+
+CK_RV           gkm_test_C_SeedRandom              (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pSeed,
+                                                    CK_ULONG ulSeedLen);
+
+CK_RV           gkm_test_C_GenerateRandom          (CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pRandomData,
+                                                    CK_ULONG ulRandomLen);
+
+/*
+ * Some dumb crypto mechanisms for simple testing.
+ *
+ * CKM_T_CAPITALIZE (encrypt/decrypt)
+ *     capitalizes to encrypt
+ *     lowercase to decrypt
+ *
+ * CKM_T_PREFIX (sign/verify)
+ *     sign prefixes data with key label
+ *     verify unprefixes data with key label.
+ *
+ * CKM_T_GENERATE (generate-pair)
+ *     generates a pair of keys, mechanism param should be 'generate'
+ *
+ * CKM_T_WRAP (wrap key)
+ *     wraps key by returning value, mechanism param should be 'wrap'
+ *
+ * CKM_T_DERIVE (derive-key)
+ *     derives key by setting value to 'derived'.
+ *     mechanism param should be 'derive'
+ */
+
+#define CKM_T_CAPITALIZE    (CKM_VENDOR_DEFINED | 1)
+#define CKM_T_PREFIX        (CKM_VENDOR_DEFINED | 2)
+#define CKM_T_GENERATE      (CKM_VENDOR_DEFINED | 3)
+#define CKM_T_WRAP          (CKM_VENDOR_DEFINED | 4)
+#define CKM_T_DERIVE        (CKM_VENDOR_DEFINED | 5)
+
+#define GKM_TEST_SLOT_ONE  52
+#define GKM_TEST_SLOT_TWO  134
+
+#endif /* TESTMODULE_H_ */
diff --git a/pkcs11/gkm/gkm-util.c b/pkcs11/gkm/gkm-util.c
index 984c5ce..26fca33 100644
--- a/pkcs11/gkm/gkm-util.c
+++ b/pkcs11/gkm/gkm-util.c
@@ -99,8 +99,8 @@ gkm_util_dispose_unref (gpointer object)
 	g_object_unref (object);
 }
 
-const gchar*
-gkm_util_rv_to_string (CK_RV rv)
+static const gchar*
+defined_rv_to_string (CK_RV rv)
 {
 	#define GKM_X(rv) case rv: return #rv;
 	switch (rv) {
@@ -198,3 +198,23 @@ gkm_util_rv_to_string (CK_RV rv)
 
 	#undef GKM_X
 }
+
+gchar*
+gkm_util_rv_to_string (CK_RV rv)
+{
+	gchar *string = g_strdup (defined_rv_to_string (rv));
+	if (string == NULL)
+		string = g_strdup_printf ("0x%08lx", (gulong)rv);
+	return string;
+}
+
+const gchar*
+gkm_util_rv_stringize (CK_RV rv)
+{
+	const gchar *string = defined_rv_to_string (rv);
+	if (string == NULL) {
+		g_message ("unknown error: %lu", (gulong)rv);
+		string = "CKR_?UNKNOWN?";
+	}
+	return string;
+}
diff --git a/pkcs11/gkm/gkm-util.h b/pkcs11/gkm/gkm-util.h
index d6ac807..b44a978 100644
--- a/pkcs11/gkm/gkm-util.h
+++ b/pkcs11/gkm/gkm-util.h
@@ -49,6 +49,8 @@ CK_ULONG              gkm_util_next_handle                        (void);
 
 void                  gkm_util_dispose_unref                      (gpointer object);
 
-const gchar*          gkm_util_rv_to_string                       (CK_RV rv);
+const gchar*          gkm_util_rv_stringize                       (CK_RV rv);
+
+gchar*                gkm_util_rv_to_string                       (CK_RV rv);
 
 #endif /* GKM_UTIL_H_ */
diff --git a/pkcs11/wrap-layer/Makefile.am b/pkcs11/wrap-layer/Makefile.am
index f4d3a28..fee3a59 100644
--- a/pkcs11/wrap-layer/Makefile.am
+++ b/pkcs11/wrap-layer/Makefile.am
@@ -22,3 +22,13 @@ libgkm_wrap_layer_la_LIBADD = \
 libgkm_wrap_layer_la_CFLAGS = \
 	$(GTHREAD_CFLAGS) \
 	$(GLIB_CFLAGS)
+
+# ------------------------------------------------------------------------------
+
+if WITH_TESTS
+TESTS_DIR = tests
+else
+TESTS_DIR =
+endif
+
+SUBDIRS = . $(TESTS_DIR)
\ No newline at end of file
diff --git a/pkcs11/wrap-layer/gkm-wrap-prompt.c b/pkcs11/wrap-layer/gkm-wrap-prompt.c
index 1ba8986..25f6fe4 100644
--- a/pkcs11/wrap-layer/gkm-wrap-prompt.c
+++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c
@@ -909,6 +909,9 @@ login_prompt_do_user (GkmWrapPrompt *self, CK_RV last_result,
 	if (rv != CKR_OK)
 		return FALSE;
 
+	/* Hard reset on first prompt, soft on later */
+	gku_prompt_reset (GKU_PROMPT (self), last_result == CKR_OK);
+
 	prepare_unlock_token (self, &tinfo);
 
 	gku_prompt_request_attention_sync (NULL, on_prompt_attention,
diff --git a/pkcs11/wrap-layer/tests/Makefile.am b/pkcs11/wrap-layer/tests/Makefile.am
new file mode 100644
index 0000000..308bdbf
--- /dev/null
+++ b/pkcs11/wrap-layer/tests/Makefile.am
@@ -0,0 +1,24 @@
+
+INCLUDES = -I. \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/pkcs11 \
+	$(GLIB_CFLAGS) \
+	$(P11_TESTS_CFLAGS)
+
+LIBS = \
+	$(GLIB_LIBS) \
+	$(GTHREAD_LIBS)
+
+noinst_PROGRAMS = \
+	test-create-credential
+
+test_create_credential_SOURCES = \
+	test-create-credential.c
+
+test_create_credential_LDADD = \
+	$(top_builddir)/pkcs11/wrap-layer/libgkm-wrap-layer.la \
+	$(top_builddir)/pkcs11/gkm/libgkm.la \
+	$(top_builddir)/ui/libgku-prompt.la \
+	$(top_builddir)/egg/libegg.la \
+	$(DAEMON_LIBS)
\ No newline at end of file
diff --git a/pkcs11/wrap-layer/tests/test-create-credential.c b/pkcs11/wrap-layer/tests/test-create-credential.c
new file mode 100644
index 0000000..99375e8
--- /dev/null
+++ b/pkcs11/wrap-layer/tests/test-create-credential.c
@@ -0,0 +1,170 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2010 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "egg/egg-libgcrypt.h"
+#include "egg/egg-secure-memory.h"
+
+#include "gkm/gkm-test.h"
+#include "gkm/gkm-util.h"
+
+#include "pkcs11/pkcs11.h"
+
+#include "wrap-layer/gkm-wrap-layer.h"
+
+#include <glib-object.h>
+
+CK_FUNCTION_LIST create_credential_functions = {
+	{ 2, 11 },	/* version */
+	gkm_test_C_Initialize,
+	gkm_test_C_Finalize,
+	gkm_test_C_GetInfo,
+	gkm_test_C_GetFunctionList,
+	gkm_test_C_GetSlotList,
+	gkm_test_C_GetSlotInfo,
+	gkm_test_C_GetTokenInfo,
+	gkm_test_C_GetMechanismList,
+	gkm_test_C_GetMechanismInfo,
+	gkm_test_C_InitToken,
+	gkm_test_C_InitPIN,
+	gkm_test_C_SetPIN,
+	gkm_test_C_OpenSession,
+	gkm_test_C_CloseSession,
+	gkm_test_C_CloseAllSessions,
+	gkm_test_C_GetSessionInfo,
+	gkm_test_C_GetOperationState,
+	gkm_test_C_SetOperationState,
+	gkm_test_C_Login,
+	gkm_test_C_Logout,
+	gkm_test_C_CreateObject,
+	gkm_test_C_CopyObject,
+	gkm_test_C_DestroyObject,
+	gkm_test_C_GetObjectSize,
+	gkm_test_C_GetAttributeValue,
+	gkm_test_C_SetAttributeValue,
+	gkm_test_C_FindObjectsInit,
+	gkm_test_C_FindObjects,
+	gkm_test_C_FindObjectsFinal,
+	gkm_test_C_EncryptInit,
+	gkm_test_C_Encrypt,
+	gkm_test_C_EncryptUpdate,
+	gkm_test_C_EncryptFinal,
+	gkm_test_C_DecryptInit,
+	gkm_test_C_Decrypt,
+	gkm_test_C_DecryptUpdate,
+	gkm_test_C_DecryptFinal,
+	gkm_test_C_DigestInit,
+	gkm_test_C_Digest,
+	gkm_test_C_DigestUpdate,
+	gkm_test_C_DigestKey,
+	gkm_test_C_DigestFinal,
+	gkm_test_C_SignInit,
+	gkm_test_C_Sign,
+	gkm_test_C_SignUpdate,
+	gkm_test_C_SignFinal,
+	gkm_test_C_SignRecoverInit,
+	gkm_test_C_SignRecover,
+	gkm_test_C_VerifyInit,
+	gkm_test_C_Verify,
+	gkm_test_C_VerifyUpdate,
+	gkm_test_C_VerifyFinal,
+	gkm_test_C_VerifyRecoverInit,
+	gkm_test_C_VerifyRecover,
+	gkm_test_C_DigestEncryptUpdate,
+	gkm_test_C_DecryptDigestUpdate,
+	gkm_test_C_SignEncryptUpdate,
+	gkm_test_C_DecryptVerifyUpdate,
+	gkm_test_C_GenerateKey,
+	gkm_test_C_GenerateKeyPair,
+	gkm_test_C_WrapKey,
+	gkm_test_C_UnwrapKey,
+	gkm_test_C_DeriveKey,
+	gkm_test_C_SeedRandom,
+	gkm_test_C_GenerateRandom,
+	gkm_test_C_GetFunctionStatus,
+	gkm_test_C_CancelFunction,
+	gkm_test_C_WaitForSlotEvent
+};
+
+EGG_SECURE_GLIB_DEFINITIONS()
+
+static gpointer
+test (gpointer loop)
+{
+	CK_FUNCTION_LIST_PTR module;
+	CK_SESSION_HANDLE session;
+	CK_SLOT_ID slot_id;
+	CK_ULONG n_slots = 1;
+	CK_RV rv;
+
+	gkm_wrap_layer_add_module (&create_credential_functions);
+	module = gkm_wrap_layer_get_functions ();
+
+	/* Open a session */
+	rv = (module->C_Initialize) (NULL);
+	gkm_assert_cmprv (rv, ==, CKR_OK);
+
+	rv = (module->C_GetSlotList) (CK_TRUE, &slot_id, &n_slots);
+	gkm_assert_cmprv (rv, ==, CKR_OK);
+
+	rv = (module->C_OpenSession) (slot_id, CKF_SERIAL_SESSION, NULL, NULL, &session);
+	gkm_assert_cmprv (rv, ==, CKR_OK);
+
+	rv = (module->C_Login) (session, CKU_USER, NULL, 0);
+	if (rv == CKR_PIN_INCORRECT) {
+		g_message ("pin incorrect");
+	} else {
+		gkm_assert_cmprv (rv, ==, CKR_OK);
+		g_message ("pin correct");
+	}
+
+	rv = (module->C_CloseSession) (session);
+	gkm_assert_cmprv (rv, ==, CKR_OK);
+
+	rv = (module->C_Finalize) (NULL);
+	gkm_assert_cmprv (rv, ==, CKR_OK);
+
+	g_main_loop_quit (loop);
+	return NULL;
+}
+
+int
+main(void)
+{
+	GThread *thread;
+	GMainLoop *loop;
+
+	g_type_init ();
+	g_thread_init (NULL);
+	egg_libgcrypt_initialize ();
+
+	loop = g_main_loop_new (NULL, FALSE);
+	thread = g_thread_create (test, loop, TRUE, NULL);
+	g_assert (thread);
+
+	g_main_loop_run (loop);
+
+	g_thread_join (thread);
+	g_main_loop_unref (loop);
+
+	return 0;
+}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]