tests: added check to ensure that pkcs11 objects will be reopened on forkpkcs11-check

This checks whether C_Initialize() and C_OpenSession() will be called
again when using a PKCS#11 module.

Resolves #95

4 files changed, 206 insertions, 2 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 39514d0779..76e87d9000 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -155,10 +155,14 @@ pkcs11_import_url_privkey_SOURCES = pkcs11/pkcs11-import-url-privkey.c
 pkcs11_import_url_privkey_DEPENDENCIES = libpkcs11mock1.la libutils.la
 pkcs11_import_url_privkey_LDADD = $(LDADD) $(LIBDL)
 
+pkcs11_privkey_fork_SOURCES = pkcs11/pkcs11-privkey-fork.c
+pkcs11_privkey_fork_DEPENDENCIES = libpkcs11mock1.la libutils.la
+pkcs11_privkey_fork_LDADD = $(LDADD) $(LIBDL)
+
 ctests += pkcs11-cert-import-url-exts pkcs11-get-exts pkcs11-get-raw-issuer-exts \
 	pkcs11-cert-import-url4-exts pkcs11/pkcs11-chainverify pkcs11/pkcs11-get-issuer pkcs11/pkcs11-is-known \
 	pkcs11/pkcs11-combo pkcs11/pkcs11-privkey pkcs11/pkcs11-pubkey-import-rsa pkcs11/pkcs11-pubkey-import-ecdsa \
-	pkcs11-import-url-privkey
+	pkcs11-import-url-privkey pkcs11-privkey-fork
 
 
 endif
diff --git a/tests/pkcs11/pkcs11-mock.c b/tests/pkcs11/pkcs11-mock.c
index de265bf5d0..98d6af80f9 100644
--- a/tests/pkcs11/pkcs11-mock.c
+++ b/tests/pkcs11/pkcs11-mock.c
@@ -15,6 +15,7 @@
 
 #include "pkcs11-mock.h"
 #include "pkcs11-mock-ext.h"
+#include <string.h>
 #include <stdlib.h>
 
 unsigned int pkcs11_mock_flags = 0;
@@ -191,6 +192,25 @@ CK_FUNCTION_LIST pkcs11_mock_functions =
 	&C_WaitForSlotEvent
 };
 
+#if defined(HAVE___REGISTER_ATFORK)
+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
+extern void *__dso_handle;
+static unsigned registered_fork_handler = 0;
+
+static void fork_handler(void)
+{
+	pkcs11_mock_initialized = CK_FALSE;
+	pkcs11_mock_session_opened = CK_FALSE;
+	if (mock_session) {
+		mock_session->state = CKS_RO_PUBLIC_SESSION;
+		mock_session->find_op.active_operation = PKCS11_MOCK_CK_OPERATION_NONE;
+		free(mock_session->find_label);
+	}
+	free(mock_session);
+	mock_session = NULL;
+}
+#endif
+
 
 CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(CK_VOID_PTR pInitArgs)
 {
@@ -199,6 +219,12 @@ CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(CK_VOID_PTR pInitArgs)
 
 	IGNORE(pInitArgs);
 
+#if defined(HAVE___REGISTER_ATFORK)
+	if (registered_fork_handler == 0) {
+		__register_atfork(NULL, NULL, fork_handler, __dso_handle);
+		registered_fork_handler = 1;
+	}
+#endif
 	pkcs11_mock_initialized = CK_TRUE;
 
 	return CKR_OK;
@@ -534,7 +560,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(CK_SLOT_ID slotID, CK_FLAGS flags, CK_V
 {
 	if (CK_FALSE == pkcs11_mock_initialized)
 		return CKR_CRYPTOKI_NOT_INITIALIZED;
-
 	if (CK_TRUE == pkcs11_mock_session_opened)
 		return CKR_SESSION_COUNT;
 
@@ -583,6 +608,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_CloseSession)(CK_SESSION_HANDLE hSession)
 	mock_session->find_op.active_operation = PKCS11_MOCK_CK_OPERATION_NONE;
 	free(mock_session->find_label);
 	free(mock_session);
+	mock_session = NULL;
 
 	return CKR_OK;
 }
@@ -895,6 +921,15 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetAttributeValue)(CK_SESSION_HANDLE hSession, CK_OB
 
 			pTemplate[i].ulValueLen = strlen(PKCS11_MOCK_CK_OBJECT_CKA_LABEL);
 		}
+		else if (CKA_KEY_TYPE == pTemplate[i].type)
+		{
+			CK_KEY_TYPE t;
+			if (pTemplate[i].ulValueLen != sizeof(CK_KEY_TYPE))
+				return CKR_ARGUMENTS_BAD;
+
+			t = CKK_RSA;
+			memcpy(pTemplate[i].pValue, &t, sizeof(CK_KEY_TYPE));
+		}
 		else if (CKA_ID == pTemplate[i].type)
 		{
 			if (NULL != pTemplate[i].pValue)
diff --git a/tests/pkcs11/pkcs11-mock.h b/tests/pkcs11/pkcs11-mock.h
index 876526497f..9b2a66bbd0 100644
--- a/tests/pkcs11/pkcs11-mock.h
+++ b/tests/pkcs11/pkcs11-mock.h
@@ -14,6 +14,8 @@
  */
 
 
+#define _POSIX_C_SOURCE 200809
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/tests/pkcs11/pkcs11-privkey-fork.c b/tests/pkcs11/pkcs11-privkey-fork.c
new file mode 100644
index 0000000000..d2039251d7
--- /dev/null
+++ b/tests/pkcs11/pkcs11-privkey-fork.c
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/abstract.h>
+
+#include "utils.h"
+
+/* Tests whether a gnutls_privkey_t will continue to work after
+ * a fork(). */
+
+#if defined(HAVE___REGISTER_ATFORK)
+
+#define PIN "1234"
+#ifdef _WIN32
+# define P11LIB "libpkcs11mock1.dll"
+#else
+# include <dlfcn.h>
+# define P11LIB "libpkcs11mock1.so"
+#endif
+
+
+static const gnutls_datum_t testdata = {(void*)"test test", 9};
+
+static void tls_log_func(int level, const char *str)
+{
+	fprintf(stderr, "|<%d>| %s", level, str);
+}
+
+static
+int pin_func(void* userdata, int attempt, const char* url, const char *label,
+		unsigned flags, char *pin, size_t pin_max)
+{
+	if (attempt == 0) {
+		strcpy(pin, PIN);
+		return 0;
+	}
+	return -1;
+}
+
+void doit(void)
+{
+	int ret;
+	const char *lib;
+	gnutls_privkey_t key;
+	gnutls_datum_t sig = {NULL, 0}, data;
+	pid_t pid;
+
+	data.data = (void*)"\x38\x17\x0c\x08\xcb\x45\x8f\xd4\x87\x9c\x34\xb6\xf6\x08\x29\x4c\x50\x31\x2b\xbb";
+	data.size = 20;
+
+	ret = global_init();
+	if (ret != 0) {
+		fail("%d: %s\n", ret, gnutls_strerror(ret));
+		exit(1);
+	}
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(4711);
+
+	lib = getenv("P11MOCKLIB1");
+	if (lib == NULL)
+		lib = P11LIB;
+
+	ret = gnutls_pkcs11_init(GNUTLS_PKCS11_FLAG_MANUAL, NULL);
+	if (ret != 0) {
+		fail("%d: %s\n", ret, gnutls_strerror(ret));
+		exit(1);
+	}
+
+	ret = gnutls_pkcs11_add_provider(lib, NULL);
+	if (ret != 0) {
+		fail("%d: %s\n", ret, gnutls_strerror(ret));
+		exit(1);
+	}
+
+	ret = gnutls_privkey_init(&key);
+	assert(ret>=0);
+
+	gnutls_privkey_set_pin_function(key, pin_func, NULL);
+
+	ret = gnutls_privkey_import_url(key, "pkcs11:object=test", GNUTLS_PKCS11_OBJ_FLAG_LOGIN);
+	if (ret < 0) {
+		fail("%d: %s\n", ret, gnutls_strerror(ret));
+		exit(1);
+	}
+
+	ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig);
+	if (ret < 0) {
+		fail("%d: %s\n", ret, gnutls_strerror(ret));
+		exit(1);
+	}
+
+	gnutls_free(sig.data);
+	sig.data = NULL;
+
+	pid = fork();
+	if (pid != 0) {
+		int status;
+		assert(waitpid(pid, &status, 0) >= 0);
+
+		if (WEXITSTATUS(status) != 0) {
+			fail("child return status was unexpected: %d\n", WEXITSTATUS(status));
+			exit(1);
+		}
+	} else { /* child */
+		ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig);
+		if (ret < 0) {
+			fail("%d: %s\n", ret, gnutls_strerror(ret));
+			exit(1);
+		}
+
+		gnutls_free(sig.data);		
+		gnutls_privkey_deinit(key);
+		gnutls_global_deinit();
+		exit(0);
+	}
+
+	if (debug)
+		printf("done\n\n\n");
+
+	gnutls_privkey_deinit(key);
+	gnutls_global_deinit();
+}
+#else
+void doit(void)
+{
+	exit(77);
+}
+#endif