Major refactor and vendor abstraction.

ykcs11/yubico.c

@@ -1,7 +1,58 @@
 #include "yubico.h"
 #include "pkcs11.h"
 
-CK_VERSION YUBICO_get_version(CK_UTF8CHAR_PTR version, CK_ULONG len) {
+
+CK_UTF8CHAR_PTR YUBICO_get_slot_description(void) {
+  
+  return "YubiKey Virtual Reader";
+  
+}
+
+CK_UTF8CHAR_PTR YUBICO_get_slot_manufacturer(void) {
+
+  return "Yubico";
+
+}
+
+CK_FLAGS YUBICO_get_slot_flags(void) {
+
+  return CKF_TOKEN_PRESENT | CKF_HW_SLOT;
+
+}
+
+CK_VERSION YUBICO_get_slot_version(CK_UTF8CHAR_PTR version, CK_ULONG len) {
+
+  CK_VERSION v = {1.0}; // Dummy value
+
+  return v;
+
+}
+
+CK_UTF8CHAR_PTR YUBICO_get_token_label(void) {
+
+  return "YubiKey PIV";
+
+}
+
+CK_UTF8CHAR_PTR YUBICO_get_token_manufacturer(void) {
+
+  return "Yubico";
+
+}
+
+CK_UTF8CHAR_PTR YUBICO_get_token_model(void) {
+
+  return "PRO";
+
+}
+
+CK_FLAGS YUBICO_get_token_flags(void) {
+
+  return CKF_RNG | CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_TOKEN_INITIALIZED;
+
+}
+
+CK_VERSION YUBICO_get_token_version(CK_UTF8CHAR_PTR version, CK_ULONG len) {
 
   CK_VERSION v = {0, 0};
   int i = 0;
@@ -28,26 +79,8 @@ CK_VERSION YUBICO_get_version(CK_UTF8CHAR_PTR version, CK_ULONG len) {
   return v;
 }
 
-CK_UTF8CHAR_PTR YUBICO_get_label(void) {
+CK_BYTE_PTR YUBICO_get_token_serial(void) {
 
-  return "YubiKey";
-
-}
-
-CK_UTF8CHAR_PTR YUBICO_get_manufacturer(void) {
-
-  return "Yubico";
-
-}
-
-CK_UTF8CHAR_PTR YUBICO_get_model(void) {
-
-  return "PRO";
-
-}
-
-CK_FLAGS YUBICO_get_flags(void) {
-
-  return CKF_RNG | CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_TOKEN_INITIALIZED;
+  return "1234";
 
 }