Commit Graph
100 Commits
Author SHA1 Message Date
Vincent BreitmoserandDominik Schürmann 3a818e8cde improve security token connection unit tests 2017-11-02 19:25:08 +01:00
Vincent Breitmoser a42391f7e9 add Nitrokey Pro to whitelist for reset and key import after testing 2017-10-31 16:07:07 +01:00
Vincent Breitmoser aef66e97ea Disable reset for Gnuk token version < 1.2.5 2017-10-31 15:40:14 +01:00
Vincent Breitmoser a51d0555e1 Retain RSA public exponent length when setting key attributes in putKey operation
Similar to the previous commit, openpgp applet implementations differ in
regards to the public exponent length. As of this writing:
- The SmartPGP applet requires an 11 bit public exponent size
- The Gnuk token requires a 32 bit public exponent size

For this reason, we simply set the public exponent size to the one
previously set in the key attribute info. With this commit, the only
variable that can actually change for an RSA key is its modulus size.
2017-10-30 22:57:13 +01:00
Vincent Breitmoser 778fb8e94a Retain RSA key format when setting key attributes in putKey operation
For the put secret key operation, openpgp applet implementations differ
in their handling of attributes:

- there are four formats for sending key data: standard, standard with
  modulus, with crt, and with crt and modulus.
- the key attributes (modulus length, public exponent length, key
  format) can not be changed on all cards. changing them is only
  necessary for cards that support different key lengths (that is,
  RSA 4096)
- on the cards where they *can* be changed, not all parameters might be
  changeable. in particular, modulus length may be changeable but not
  key format.

Because of this constellation, the put key operation now only sets the
modulus of the key, while retaining the key format. At the time of
writing, the Gnuk and Nitrokey use the standard format, while the
Yubikey and other applets use crt+modulus.

This fixes loading keys into the Nitrokey Pro, and partially for the
Gnuk token.
2017-10-30 21:45:38 +01:00
Vincent Breitmoser 5f622339b1 Output usb data to debug log 2017-10-30 17:01:49 +01:00
Vincent Breitmoser 83b6c0e2f0 use correct max packet size in CcidReceiver 2017-10-29 02:42:26 +02:00
Vincent Breitmoser 0021c1f15f add tests for CcidTransceiver 2017-10-29 02:42:26 +02:00
Vincent Breitmoser 8b07428ec0 document T1TpduProtocol slighly better 2017-10-28 23:32:07 +02:00
Vincent Breitmoser 19dc0db89b add gnuk to supported tokens 2017-10-28 23:32:03 +02:00
Vincent Breitmoser 83ec3e7bf1 change "generic" to "communication" 2017-10-28 13:32:06 +02:00
Vincent Breitmoser 95034e36b1 fix unit test 2017-10-26 17:44:13 +02:00
Vincent Breitmoser b6236bde59 determine token type during connect 2017-10-26 17:20:13 +02:00
Vincent Breitmoser 8649332bdc don't distinguish unknown tokens by transport 2017-10-26 17:20:13 +02:00
Vincent Breitmoser 14b74b7590 add token transport and type to SecurityTokenInfo 2017-10-26 17:19:22 +02:00
Vincent BreitmoserandGitHub 0bb32fad2a Merge pull request #2194 from open-keychain/remove-fp-color
Remove colorization of fingerprints
2017-10-24 01:17:46 +02:00
Vincent BreitmoserandGitHub f41debb0e9 Merge pull request #2193 from hagau/fix_notifications
Fix showing of some notifications
2017-10-23 21:17:05 +02:00
Vincent Breitmoser 7eb37a89d8 reduce number of token roundtrips used to obtain SecurityTokenInfo 2017-10-23 20:40:25 +02:00
Vincent Breitmoser 2812f07d34 add rudimentary unit test for SecurityTokenConnection 2017-10-23 20:40:25 +02:00
Vincent Breitmoser c295a6815f write nfc communication to debug output 2017-10-23 20:40:25 +02:00
Vincent Breitmoser edaa629f46 add unit tests for CommandApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser 911d2a1c96 rewrite CommandApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser c89aab8802 reduce visibility where unnecessary 2017-10-23 20:40:25 +02:00
Vincent Breitmoser a4af2f7f5c rewrite ResponseApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser e8103d8376 use reset instead of modify for changing pw1 2017-10-23 20:40:25 +02:00
Vincent Breitmoser 9b292a4c70 rename CommandAPDUFactory -> OpenPgpCommandApduFactory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser b7723c1a4a replace magic constants in APDU factory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser 8e9a62070d extract creation of CommandAPDUs into factory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser 46b69d45c4 explicitly pass around instance of SecurityTokenConnection 2017-10-23 20:40:25 +02:00
Vincent Breitmoser e8f72718e9 rename SecurityTokenHelper to SecurityTokenConnection 2017-10-23 20:38:04 +02:00
Vincent BreitmoserandGitHub 476f756607 Merge pull request #2189 from open-keychain/disable-tokens
Disable unsupported USB tokens
2017-10-23 11:07:59 +02:00
Vincent Breitmoser dfed7d3c93 Move decision of whether to show button into ShowNfcSweetspotActivity 2017-10-12 10:05:04 +02:00
Vincent Breitmoser 287d3251c5 Add "Where is my NFC reader?" feature to nfc waiting dialog 2017-10-10 05:06:40 +02:00
Vincent Breitmoser c07e808d24 add nfc sweetspot data, scraped from NFC-Ring API 2017-10-10 04:54:43 +02:00
Vincent Breitmoser 0cb000a0be Change some package structure 2017-10-09 14:24:42 +02:00
Vincent Breitmoser a51252910b some T=1 refactoring 2017-10-09 14:17:30 +02:00
Vincent Breitmoser 6cc058e25f some more cleanup in usb classes 2017-10-08 05:01:40 +02:00
Vincent Breitmoser 31da4c450d Ignore leading data before IccPowerOn operation in CcidTransceiver 2017-10-08 05:01:39 +02:00
Vincent Breitmoser 7a24f4c237 refactor CcidTransceiver 2017-10-08 05:01:25 +02:00
Vincent Breitmoser 65c1ca91d4 explicitly connect before writing to output stream while creating github linked id 2017-10-06 19:19:35 +02:00
Vincent Breitmoser c4905c5eda increase timeouts for github account linking 2017-10-06 19:07:54 +02:00
Vincent Breitmoser fa3345f595 fix base64 encoding for github auth revocation 2017-10-06 19:07:40 +02:00
Vincent Breitmoser 2debc23ce0 slightly nicer error reporting for security token cla chaining 2017-10-06 19:06:43 +02:00
Vincent BreitmoserandGitHub 618c3a506c Merge pull request #2167 from open-keychain/ditch-consolidate
Ditch "consolidate" mechanism
2017-10-02 16:46:12 +02:00
Vincent Breitmoser b2e4a035a2 make qr code background color in transfer fragment white 2017-09-30 21:30:10 +02:00
Vincent Breitmoser 4536645170 don't show "link account" button if feature is disabled 2017-09-30 21:19:20 +02:00
Vincent Breitmoser 95e6562386 fix more NPEs in ManageSecurityTokenFragment 2017-09-29 23:41:32 +02:00
Vincent Breitmoser 565c237903 nicer preview for api deduplicate key dialog 2017-09-29 15:56:50 +02:00
Vincent Breitmoser 7ee41aa51c support partially bound tokens in key health view 2017-09-28 17:29:46 +02:00
Vincent Breitmoser 77856afc4f locked empty security tokens are locked, not empty 2017-09-28 17:29:46 +02:00
Vincent Breitmoser 3d473e05ad set security token admin pin to 12345678 in debug builds 2017-09-28 17:29:46 +02:00
Vincent BreitmoserandGitHub 75263f8d37 Merge pull request #2171 from kbsriram/license-update
Update interop test license to Apache 2.0
2017-09-28 15:26:19 +02:00
Vincent Breitmoser 4a0c61a478 prevent crashes after detach in manage security token fragment 2017-09-27 20:16:14 +02:00
Vincent Breitmoser bf31d4f55d add logging 2017-09-23 01:54:34 +02:00
Vincent Breitmoser a6f97cf46e remember if key signatures table has been initialized 2017-09-23 01:35:40 +02:00
Vincent Breitmoser 678a5c1562 slight cleanup 2017-09-23 01:35:39 +02:00
Vincent Breitmoser b814753b3b get rid of consolidate operation 2017-09-23 01:35:39 +02:00
Vincent Breitmoser f413d77360 introduce updateTrustDb to use instead of a full consolidate 2017-09-23 01:35:39 +02:00
Vincent Breitmoser e23045aeb8 introduce key signatures table 2017-09-22 04:18:14 +02:00
Vincent Breitmoser 2cd995526e set correct upload status for newly created keys 2017-09-22 01:58:43 +02:00
Vincent Breitmoser 318005dbb6 load keys from sd card during consolidate 2017-09-22 00:22:15 +02:00
Vincent Breitmoser fa258fb8b3 fix on click listener for linked identity items 2017-09-21 22:53:56 +02:00
Vincent Breitmoser 647589c9ae default caching ttl to "until cleared" 2017-09-20 20:50:03 +02:00
Vincent Breitmoser 03ca1292fa remember last selected passphrase cache ttl 2017-09-20 17:02:15 +02:00
Vincent Breitmoser d04439df6b ditch passphrase "time to live" setting 2017-09-20 17:02:15 +02:00
Vincent Breitmoser 90b7a0f4f1 handle one-octet length headers in public key block reformatting 2017-09-19 15:04:25 +02:00
Vincent Breitmoser 534f816e35 slightly nicer error reporting for reading from clipboard 2017-09-19 13:00:41 +02:00
Vincent Breitmoser ded139d302 aggressively reformat public key blocks from clipboard 2017-09-19 12:58:42 +02:00
Vincent BreitmoserandGitHub 1f2d9c85e0 Merge pull request #2160 from open-keychain/remove-move-to-card
remove "Move to Card" action from subkey edit ui
2017-09-13 10:45:54 +02:00
Vincent Breitmoser 12b6d42990 fix untranslatable string 2017-09-12 12:52:54 +02:00
Vincent Breitmoser c6557cc5fd remove "Move to Card" action from subkey edit ui 2017-09-12 02:08:30 +02:00
Vincent BreitmoserandGitHub 68b3923c33 Merge pull request #2157 from open-keychain/token-import
new Security Token import flow
2017-09-11 15:52:26 +02:00
Vincent Breitmoser 863651918e token-import: use entire fingerprint for promote operation 2017-09-11 15:30:10 +02:00
Vincent Breitmoser 10eeb5672b token-import: match fingerprints of subkeys 2017-09-11 15:30:06 +02:00
Vincent Breitmoser a1b049993f token-import: look up keys locally by all fingerprints 2017-09-11 03:20:00 +02:00
Vincent Breitmoser bd2e6aa698 token-import: bind only relevant subkeys 2017-09-11 01:55:03 +02:00
Vincent Breitmoser e0b5d97356 token-import: add entrypoint for blank token setup flow 2017-09-11 01:44:50 +02:00
Vincent Breitmoser 19bb4ff83c token-import: don't load fragment multiple times 2017-09-11 01:44:40 +02:00
Vincent Breitmoser bdc855d618 token-import: add debug states for locked keys 2017-09-11 01:44:40 +02:00
Vincent Breitmoser 419dffab02 token-import: move debug states out of fragment 2017-09-11 01:44:39 +02:00
Vincent Breitmoser 646940eb44 token-import: add ui for pin change and unlock 2017-09-11 01:43:20 +02:00
Vincent Breitmoser 36bec236f4 add routines to unlock security token 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 4d0a686220 token-import: show unlock option for locked keys 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 768abb3074 token-import: introduce parcelable SecurityTokenInfo 2017-09-08 15:17:33 +02:00
Vincent Breitmoser f40cebfb21 ditch yubikey fragment in ViewKeyActivity 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 292b35c26d token-import: allow detaching of presenter 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 16d6f07fe7 token-import: handle runtime storage permission 2017-09-08 15:16:50 +02:00
Vincent Breitmoser c1773de1c3 token-import: handle empty urls better 2017-09-08 15:16:50 +02:00
Vincent Breitmoser f1852338af debug: don't consolidate when a key is deleted 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 8ae12e7590 token-import: option to simulate keys for import in debug builds 2017-09-08 15:16:50 +02:00
Vincent Breitmoser fb2a8624a4 token-import: remove old import/reset fragment 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 2d2dce754d fix stupid error in UncachedKeyRing 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 1af6a2796c token-import: change package structure a bit 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 363551723b token-import: add logging 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 050aed1ef5 token-import: extract string resources 2017-09-08 15:16:50 +02:00
Vincent Breitmoser e9efc07b74 token-import: reset yubikey 2017-09-08 15:16:50 +02:00
Vincent Breitmoser bc3031c9eb token-import: load from file 2017-09-08 15:16:50 +02:00
Vincent Breitmoser af7d36c038 token-import: first iteration 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 21bc6f12f0 fix bugs introduced by using byte[] instead of String for fingerprints 2017-09-08 14:50:10 +02:00
Vincent Breitmoser 4a4e325bca encrypt to signing key in openkeychain ui 2017-09-06 22:07:56 +02:00