Merge remote-tracking branch 'refs/remotes/origin/master'

Fedict · Jul 10, 2020 · 1b3bc90 · 1b3bc90
2 parents 11c31bb + ee16f74
commit 1b3bc90
Show file tree

Hide file tree

Showing 43 changed files with 2,416 additions and 176 deletions.
diff --git a/VS_2019/beid.sln b/VS_2019/beid.sln
@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdrv", "..\cardcomm\minidriver\VS_2019\beidmdrv.vcxproj", "{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkcs11", "..\cardcomm\pkcs11\VS_2019\beidpkcs11.vcxproj", "{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		PKCS11_FF_DEBUG|x64 = PKCS11_FF_DEBUG|x64
+		PKCS11_FF_DEBUG|x86 = PKCS11_FF_DEBUG|x86
+		PKCS11_FF_Release|x64 = PKCS11_FF_Release|x64
+		PKCS11_FF_Release|x86 = PKCS11_FF_Release|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Debug|x64.ActiveCfg = Debug|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Debug|x64.Build.0 = Debug|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Debug|x86.ActiveCfg = Debug|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Debug|x86.Build.0 = Debug|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_DEBUG|x64.ActiveCfg = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_DEBUG|x64.Build.0 = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_DEBUG|x86.ActiveCfg = Release|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_DEBUG|x86.Build.0 = Release|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_Release|x64.ActiveCfg = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_Release|x64.Build.0 = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_Release|x86.ActiveCfg = Release|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.PKCS11_FF_Release|x86.Build.0 = Release|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Release|x64.ActiveCfg = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Release|x64.Build.0 = Release|x64
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Release|x86.ActiveCfg = Release|Win32
+		{479FFA33-2B41-4A15-8192-A41F9FBE3D6A}.Release|x86.Build.0 = Release|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Debug|x64.ActiveCfg = Debug|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Debug|x64.Build.0 = Debug|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Debug|x86.ActiveCfg = Debug|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Debug|x86.Build.0 = Debug|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_DEBUG|x64.ActiveCfg = PKCS11_FF_DEBUG|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_DEBUG|x64.Build.0 = PKCS11_FF_DEBUG|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_DEBUG|x86.ActiveCfg = PKCS11_FF_DEBUG|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_DEBUG|x86.Build.0 = PKCS11_FF_DEBUG|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_Release|x64.ActiveCfg = PKCS11_FF_Release|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_Release|x64.Build.0 = PKCS11_FF_Release|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_Release|x86.ActiveCfg = PKCS11_FF_Release|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.PKCS11_FF_Release|x86.Build.0 = PKCS11_FF_Release|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Release|x64.ActiveCfg = Release|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Release|x64.Build.0 = Release|x64
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Release|x86.ActiveCfg = Release|Win32
+		{12F6CD4F-FC01-4E0A-AE06-F7A315094DFE}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0EC9E511-2A5A-4C32-8EB6-B55B3275EBDD}
+	EndGlobalSection
+EndGlobal
diff --git a/cardcomm/ctkToken/BEIDToken/TokenSession.m b/cardcomm/ctkToken/BEIDToken/TokenSession.m
@@ -166,9 +166,9 @@ - (uint8_t)pinDigit:(uint8_t) digit
     if ('0' <= digit && digit <= '9')
         return digit - '0';
     else if ('A' <= digit && digit <= 'F')
-        return digit - 'A' + 0x10;
+        return digit - 'A' + 0x0A;
     else if ('a' <= digit && digit <= 'f')
-        return digit - 'a' + 0x10;
+        return digit - 'a' + 0x0A;
     else {
         os_log_error(OS_LOG_DEFAULT, "BEID impossible PIN digit enterred");
         return 0xFF;

diff --git a/cardcomm/minidriver/VS_2019/beidmdrv.vcxproj b/cardcomm/minidriver/VS_2019/beidmdrv.vcxproj
diff --git a/cardcomm/pkcs11/VS_2019/beidpkcs11.rc b/cardcomm/pkcs11/VS_2019/beidpkcs11.rc
@@ -0,0 +1,59 @@
+// Microsoft Visual C++ generated resource script.
+//
+//#include "resource.h"
+
+#include "..\..\..\scripts\windows\beidversions.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION WIN_PKCS11_VERSION1,WIN_PKCS11_VERSION2,WIN_PKCS11_VERSION3,WIN_PKCS11_VERSION4
+ PRODUCTVERSION WIN_PKCS11_VERSION1,WIN_PKCS11_VERSION2,WIN_PKCS11_VERSION3,WIN_PKCS11_VERSION4
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "FileDescription", "pkcs11 Dynamic Link Library"
+            VALUE "CompanyName", BEID_COMPANY_NAME
+            VALUE "FileVersion", WIN_PKCS11_VERSION_STRING
+            VALUE "InternalName", "beidpkcs11"
+            VALUE "LegalCopyright", BEID_COPYRIGHT
+            VALUE "OriginalFilename", "beidpkcs11.dll"
+            VALUE "ProductName", BEID_PRODUCT_NAME
+            VALUE "ProductVersion", BEID_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////