Skip to content
This repository has been archived by the owner on Sep 1, 2023. It is now read-only.

Use OpenSC PKCS11 driver for IDEMIA cards #132

Merged
merged 1 commit into from Jun 13, 2019
Merged

Use OpenSC PKCS11 driver for IDEMIA cards #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions RELEASE-NOTES.md
View file
Open in desktop
@@ -1,3 +1,11 @@
Chrome Token Signing [1.0.9](https://github.com/open-eid/chrome-token-signing/releases/tag/v1.0.9) release notes
--------------------------------------------
- Use OpenSC for IDEMIA cards
- Use OID for card type (#122)
- Build with Visual Studio 2017 (#124)

[Full Changelog](https://github.com/open-eid/chrome-token-signing/compare/v1.0.8...v1.0.9)

Chrome Token Signing [1.0.8](https://github.com/open-eid/chrome-token-signing/releases/tag/v1.0.8) release notes
--------------------------------------------
- Add hardware token filter on Windows (#114)
Expand Down
5 changes: 1 addition & 4 deletions host-shared/PKCS11Path.cpp
View file
Open in desktop
Expand Up @@ -114,7 +114,6 @@ 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;
Expand All @@ -125,7 +124,6 @@ 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/lib/libeTPkcs11.so");
static const std::string ocsPath("/usr/local/AWP/lib/libOcsCryptoki.so");
#endif
static const std::map<std::string, Params> m = {
#ifdef _WIN32
Expand All @@ -136,6 +134,7 @@ PKCS11Path::Params PKCS11Path::getPkcs11ModulePath() {
{"3BFE1800008031FE45803180664090A4162A0083019000E1", {estPath, "PIN1", "PIN2"}}, //ESTEID_V3_WARM_DEV2_ATR
{"3BFE1800008031FE45803180664090A4162A00830F9000EF", {estPath, "PIN1", "PIN2"}}, //ESTEID_V3_WARM_DEV3_ATR
{"3BFA1800008031FE45FE654944202F20504B4903", {estPath, "PIN1", "PIN2"}}, //ESTEID_V3.5_COLD_ATR
{"3BDB960080B1FE451F830012233F536549440F9000F1", {estPath, "PIN1", "PIN2"}}, // IDEMIA 2018

{"3BDD18008131FE45904C41545649412D65494490008C", {latPath, "PIN1", "PIN2"}},

Expand All @@ -146,8 +145,6 @@ 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"}},
Expand Down