IDEMIA card support (#78)

IB-5563 Signed-off-by: Raul Metsma <[email protected]>
open-eid · Oct 30, 2018 · 8ed35d8 · 8ed35d8
1 parent d1c98f8
commit 8ed35d8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,13 @@
+browser-token-signing version [3.13.2](https://github.com/open-eid/browser-token-signing/releases/tag/v3.13.2) release notes
+--------------------------------------------
+- Add SafarAppExtension plugin for Safari 12
+- Add Belgium middleware paths (#72)
+- Add hardware token filter on Windows (#73)
+- Handle PKCS11 CKR_PIN_LOCKED error code (#74)
+- Add IDEMIA driver paths
+
+[Full Changelog](https://github.com/open-eid/browser-token-signing/compare/v3.13.1...v3.13.2)
+
 browser-token-signing version [3.13.1](https://github.com/open-eid/browser-token-signing/releases/tag/v3.13.1) release notes
 --------------------------------------------
 - Use OpenSC driver with unkown ATR on OSX/Linux (#45)

diff --git a/SafariAppExtension/TokenSigningApp.xcodeproj/project.pbxproj b/SafariAppExtension/TokenSigningApp.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
  isa = PBXAggregateTarget;
  buildConfigurationList = 4E03993D20C7DA1300BAF87E /* Build configuration list for PBXAggregateTarget "package" */;
  buildPhases = (
- 4E03994220C7DA5500BAF87E /* ShellScript */,
+ 4E03994220C7DA5500BAF87E /* Build package */,
  );
  dependencies = (
  4E03994120C7DA2500BAF87E /* PBXTargetDependency */,
@@ -326,13 +326,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
- 4E03994220C7DA5500BAF87E /* ShellScript */ = {
+ 4E03994220C7DA5500BAF87E /* Build package */ = {
  isa = PBXShellScriptBuildPhase;
  buildActionMask = 8;
  files = (
  );
  inputPaths = (
  );
+ name = "Build package";
  outputPaths = (
  );
  runOnlyForDeploymentPostprocessing = 1;
@@ -458,7 +459,7 @@
  MACOSX_DEPLOYMENT_TARGET = 10.11;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = macosx;
- VERSION = 1.0.0;
+ VERSION = 1.0.1;
  };
  name = Debug;
  };
@@ -506,7 +507,7 @@
  GCC_WARN_UNUSED_VARIABLE = YES;
  MACOSX_DEPLOYMENT_TARGET = 10.11;
  SDKROOT = macosx;
- VERSION = 1.0.0;
+ VERSION = 1.0.1;
  };
  name = Release;
  };

diff --git a/browser-token-signing.xcodeproj/project.pbxproj b/browser-token-signing.xcodeproj/project.pbxproj
@@ -295,7 +295,7 @@
  MACOSX_DEPLOYMENT_TARGET = 10.11;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = macosx;
- VERSION = 3.13.1;
+ VERSION = 3.13.2;
  };
  name = Debug;
  };
@@ -343,7 +343,7 @@
  GCC_WARN_UNUSED_VARIABLE = YES;
  MACOSX_DEPLOYMENT_TARGET = 10.11;
  SDKROOT = macosx;
- VERSION = 3.13.1;
+ VERSION = 3.13.2;
  };
  name = Release;
  };

diff --git a/common/PKCS11Path.cpp b/common/PKCS11Path.cpp
@@ -114,6 +114,7 @@ PKCS11Path::Params PKCS11Path::getPkcs11ModulePath() {
  static const std::string litPath = access(lit1Path.c_str(), F_OK) == 0 ? lit1Path : lit2Path;
  static const std::string belPath("/usr/local/lib/beid-pkcs11.bundle/Contents/MacOS/libbeidpkcs11.dylib");
  static const std::string eTokenPath("/Library/Frameworks/eToken.framework/Versions/Current/libeToken.dylib");
+ static const std::string ocsPath("/Library/AWP/lib/libOcsCryptoki.dylib");
 #else
  static const std::string openscPath("opensc-pkcs11.so");
  static const std::string estPath = openscPath;
@@ -124,6 +125,7 @@ PKCS11Path::Params PKCS11Path::getPkcs11ModulePath() {
  static const std::string litPath = access(lit1Path.c_str(), F_OK) == 0 ? lit1Path : lit2Path;
  static const std::string belPath("libbeidpkcs11.so.0");
  static const std::string eTokenPath("/usr/local/lib/libeTPkcs11.dylib");
+ static const std::string ocsPath("/usr/local/AWP/lib/libOcsCryptoki.so");
 #endif
  static const std::map<std::string, Params> m = {
 #ifdef _WIN32
@@ -144,6 +146,8 @@ PKCS11Path::Params PKCS11Path::getPkcs11ModulePath() {
 
  {"3BD5180081313A7D8073C8211030", {eTokenPath, "PIN", "PIN"}},
  {"3BD518008131FE7D8073C82110F4", {eTokenPath, "PIN", "PIN"}},
+
+ {"3BDB960080B1FE451F830012233F536549440F9000F1", {ocsPath, "PIN1", "PIN2"}},
 #endif
  {"3BF81300008131FE45536D617274417070F8", {litPath, "PIN", "PIN"}},
  {"3B7D94000080318065B08311C0A983009000", {litPath, "PIN", "PIN"}},