Skip to content

Commit

Permalink
Remove Gemalto card support and fix warnings
Browse files Browse the repository at this point in the history
IB-7701

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Jan 22, 2024
1 parent 4349f73 commit 04e2cd6
Show file tree
Hide file tree
Showing 25 changed files with 979 additions and 638 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
name: CI
on: [push, pull_request]
env:
BUILD_NUMBER: ${{ github.run_number }}
jobs:
macos:
name: Build on macOS
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'true'
uses: actions/checkout@v4
- name: Build
run: |
xcodebuild -project EstEIDTokenApp.xcodeproj -target package CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO DSTROOT=$PWD/tmp install
mkdir upload
mv *pkg upload
run: xcodebuild -project EstEIDTokenApp.xcodeproj -target package CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO DSTROOT=$PWD/tmp CURRENT_PROJECT_VERSION=${{ github.run_number }} install
- name: Archive artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: pkg
path: upload
path: ./*.pkg
24 changes: 0 additions & 24 deletions EstEIDToken/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>EstEIDToken</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
<dict>
<key>com.apple.ctk.aid</key>
<array>
<string>F04573744549442076657220312E</string>
<string>D23300000045737445494420763335</string>
<string>A000000077010800070000FE00000100</string>
</array>
<key>com.apple.ctk.class-id</key>
Expand Down
241 changes: 241 additions & 0 deletions EstEIDToken/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
{
"sourceLanguage" : "en",
"strings" : {
"AUTH_CERT" : {
"comment" : "Localizable.strings\n CryptoTokenKit",
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Card Authentication"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Card Authentication"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Card Authentication"
}
}
}
},
"AUTH_KEY" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Card Authentication"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Card Authentication"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Card Authentication"
}
}
}
},
"ENTER_PINPAD" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please enter PIN code on PinPAD"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Palun sisestada PIN kaardilugeja sõrmistikult"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please enter PIN code on PinPAD"
}
}
}
},
"INVALID_PIN" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Invalid PIN entered"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sisestati ebakorrektne PIN"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Invalid PIN entered"
}
}
}
},
"SIGN_CERT" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Digital Signature"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Digital Signature"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Certificate For Digital Signature"
}
}
}
},
"SIGN_KEY" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Digital Signature"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Digital Signature"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key For Digital Signature"
}
}
}
},
"VERIFY_TRY_LEFT" : {
"localizations" : {
"en" : {
"variations" : {
"plural" : {
"one" : {
"stringUnit" : {
"state" : "translated",
"value" : "PIN Incorrect.\nPIN will be locked next failed attempt."
}
},
"other" : {
"stringUnit" : {
"state" : "translated",
"value" : "PIN Incorrect.\n%d tries left"
}
},
"zero" : {
"stringUnit" : {
"state" : "translated",
"value" : "PIN locked.\nUnblock to reuse PIN."
}
}
}
}
},
"et" : {
"variations" : {
"plural" : {
"one" : {
"stringUnit" : {
"state" : "translated",
"value" : "Vale PIN.\nJärgmise vale koodi sisestamisel PIN lukustub."
}
},
"other" : {
"stringUnit" : {
"state" : "translated",
"value" : "Vale PIN.\n%d katset jäänud"
}
},
"zero" : {
"stringUnit" : {
"state" : "translated",
"value" : "PIN on lukus.\nTühista blokeering, et PIN-i taas kasutada."
}
}
}
}
},
"ru" : {
"variations" : {
"plural" : {
"one" : {
"stringUnit" : {
"state" : "translated",
"value" : "Неверный PIN.\nPIN будет заблокирован при следующей неудачной попытке"
}
},
"other" : {
"stringUnit" : {
"state" : "translated",
"value" : "Неправильный PIN.\nОсталось %d попыток"
}
},
"zero" : {
"stringUnit" : {
"state" : "translated",
"value" : "PIN заблокирован.\nРазблокируйте его для повторного использования PIN."
}
}
}
}
}
}
},
"WRONG_CONSTR" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Unexpected constraint"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Unexpected constraint"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Unexpected constraint"
}
}
}
}
},
"version" : "1.0"
}
6 changes: 0 additions & 6 deletions EstEIDToken/Token.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,12 @@ static const TKTokenOperationConstraint EstEIDConstraintPIN = @"PIN";
@interface Token : TKSmartCardToken<TKTokenDelegate>
@end

@interface EstEIDToken : Token
@end

@interface IDEMIAToken : Token
@end

@interface TokenSession : TKSmartCardTokenSession<TKTokenSessionDelegate>
@end

@interface EstEIDTokenSession : TokenSession
@end

@interface IDEMIATokenSession : TokenSession
@end

Expand Down
Loading

0 comments on commit 04e2cd6

Please sign in to comment.