diff options
| -rw-r--r-- | p11-kit/Makefile.am | 7 | ||||
| -rw-r--r-- | p11-kit/fixtures/system-modules/seven.module | 4 | ||||
| -rw-r--r-- | p11-kit/mock-module-ep5.c | 80 | ||||
| -rw-r--r-- | p11-kit/test-modules.c | 25 |
4 files changed, 115 insertions, 1 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index e02a1eb..fb08516 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -326,7 +326,8 @@ check_LTLIBRARIES += \ mock-two.la \ mock-three.la \ mock-four.la \ - mock-five.la + mock-five.la \ + mock-seven.la mock_one_la_SOURCES = p11-kit/mock-module-ep.c mock_one_la_LIBADD = libp11-test.la libp11-common.la @@ -357,6 +358,10 @@ mock_six_la_LDFLAGS = $(mock_one_la_LDFLAGS) mock_six_la_LIBADD = $(mock_one_la_LIBADD) endif +mock_seven_la_SOURCES = p11-kit/mock-module-ep5.c +mock_seven_la_LDFLAGS = $(mock_one_la_LDFLAGS) +mock_seven_la_LIBADD = $(mock_one_la_LIBADD) + EXTRA_DIST += \ p11-kit/fixtures \ p11-kit/test-mock.c \ diff --git a/p11-kit/fixtures/system-modules/seven.module b/p11-kit/fixtures/system-modules/seven.module new file mode 100644 index 0000000..933a956 --- /dev/null +++ b/p11-kit/fixtures/system-modules/seven.module @@ -0,0 +1,4 @@ + +module: mock-seven.so +critical: yes +enable-in: test-modules diff --git a/p11-kit/mock-module-ep5.c b/p11-kit/mock-module-ep5.c new file mode 100644 index 0000000..ae8ddcc --- /dev/null +++ b/p11-kit/mock-module-ep5.c @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2012 Stefan Walter + * Copyright (c) 2018 Red Hat, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * * The names of contributors to this software may not be + * used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * Author: Stef Walter <stef@thewalter.net>, Daiki Ueno + */ + +#include "config.h" + +#define CRYPTOKI_EXPORTS 1 +#include "pkcs11.h" + +#include "mock.h" +#include "test.h" + +static bool initialized = false; + +static CK_RV +override_initialize (CK_VOID_PTR init_args) +{ + CK_RV rv; + + if (initialized) + return CKR_CRYPTOKI_ALREADY_INITIALIZED; + rv = mock_C_Initialize (init_args); + if (rv == CKR_OK) + initialized = true; + return rv; +} + +static CK_RV +override_finalize (CK_VOID_PTR reserved) +{ + initialized = false; + return mock_C_Finalize (reserved); +} + +#ifdef OS_WIN32 +__declspec(dllexport) +#endif +CK_RV +C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list) +{ + mock_module_init (); + mock_module.C_GetFunctionList = C_GetFunctionList; + if (list == NULL) + return CKR_ARGUMENTS_BAD; + mock_module.C_Initialize = override_initialize; + mock_module.C_Finalize = override_finalize; + *list = &mock_module; + return CKR_OK; +} diff --git a/p11-kit/test-modules.c b/p11-kit/test-modules.c index a2e1430..31cbcfa 100644 --- a/p11-kit/test-modules.c +++ b/p11-kit/test-modules.c @@ -462,6 +462,30 @@ test_config_option (void) finalize_and_free_modules (modules); } +static void +test_already_initialized (void) +{ + CK_FUNCTION_LIST_PTR_PTR modules; + CK_RV rv; + + /* This enables module seven */ + p11_kit_set_progname ("test-modules"); + + modules = initialize_and_get_modules (); + assert (lookup_module_with_name (modules, "seven") != NULL); + + rv = p11_kit_modules_initialize (modules, NULL); + if (rv != CKR_OK) { + finalize_and_free_modules (modules); + assert_todo ("not implemented", "CKR_CRYPTOKI_ALREADY_INITIALIZED handling"); + } + if (!lookup_module_with_name (modules, "seven")) { + finalize_and_free_modules (modules); + assert_todo ("not implemented", "CKR_CRYPTOKI_ALREADY_INITIALIZED handling"); + } + finalize_and_free_modules (modules); +} + int main (int argc, char *argv[]) @@ -480,6 +504,7 @@ main (int argc, p11_test (test_config_option, "/modules/test_config_option"); p11_test (test_module_trusted_only, "/modules/trusted-only"); p11_test (test_module_trust_flags, "/modules/trust-flags"); + p11_test (test_already_initialized, "/modules/already-initialized"); p11_kit_be_quiet (); |