james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make ykcs11 functions pointer global to all tests.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-11-24 16:56:17 +01:00
parent 0f1b05494a
commit 262f5f4771
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/tests/ykcs11_tests.c
+16 -7
View File
@@ -2,12 +2,15 @@
#include <ykcs11-version.h> #include <ykcs11-version.h>
#include <string.h> #include <string.h>
#include <assert.h>
#define MANUFACTURER_ID "Yubico (www.yubico.com)" #define MANUFACTURER_ID "Yubico (www.yubico.com)"
#define YKCS11_DESCRIPTION "PKCS#11 PIV Library (SP-800-73)" #define YKCS11_DESCRIPTION "PKCS#11 PIV Library (SP-800-73)"
#define CRYPTOKI_VERSION_MAJ 2 #define CRYPTOKI_VERSION_MAJ 2
#define CRYPTOKI_VERSION_MIN 40 #define CRYPTOKI_VERSION_MIN 40
CK_FUNCTION_LIST_PTR funcs;
static void get_functions(CK_FUNCTION_LIST_PTR_PTR funcs) { static void get_functions(CK_FUNCTION_LIST_PTR_PTR funcs) {
if (C_GetFunctionList(funcs) != CKR_OK) { if (C_GetFunctionList(funcs) != CKR_OK) {
@@ -20,9 +23,6 @@ static void get_functions(CK_FUNCTION_LIST_PTR_PTR funcs) {
static void test_lib_info() { static void test_lib_info() {
CK_INFO info; CK_INFO info;
CK_FUNCTION_LIST_PTR funcs;
get_functions(&funcs);
if (funcs->C_GetInfo(&info) != CKR_OK) { if (funcs->C_GetInfo(&info) != CKR_OK) {
fprintf(stderr, "GetInfo failed\n"); fprintf(stderr, "GetInfo failed\n");
@@ -55,10 +55,6 @@ static void test_lib_info() {
static void test_initalize() { static void test_initalize() {
CK_FUNCTION_LIST_PTR funcs;
get_functions(&funcs);
if (funcs->C_Initialize(NULL) != CKR_OK) { if (funcs->C_Initialize(NULL) != CKR_OK) {
fprintf(stderr, "Unable to initialize YKCS11\n"); fprintf(stderr, "Unable to initialize YKCS11\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -71,12 +67,25 @@ static void test_initalize() {
} }
static void test_token_info() {
CK_TOKEN_INFO info;
assert(funcs->C_GetTokenInfo(0, &info) == CKR_OK);
/*fprintf
}*/
}
int main(void) { int main(void) {
get_functions(&funcs);
test_lib_info(); test_lib_info();
#ifdef HW_TESTS #ifdef HW_TESTS
test_initalize(); test_initalize();
test_token_info();
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;