Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix strings | Dominik Schürmann | 2016-04-18 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 12 | -29/+48 |
|\ | |||||
| * | Merge pull request #1835 from nmikhailov/check_security_token | Dominik Schürmann | 2016-04-16 | 12 | -29/+48 |
| |\ | | | | | | | Check security token | ||||
| | * | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 2 | -8/+10 |
| | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint | ||||
| | * | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 3 | -5/+22 |
| | | | |||||
| | * | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 9 | -24/+24 |
| | | | |||||
* | | | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 2 | -2/+3 |
|/ / | |||||
* | | Fix string | Dominik Schürmann | 2016-04-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1824 from nmikhailov/otg2 | Dominik Schürmann | 2016-04-15 | 21 | -898/+1847 |
|\| | | | | | [WIP] USB OTG Support for Yubikey | ||||
| * | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 6 | -34/+34 |
| | | |||||
| * | OTG: Skip TokenWaitFragmen when otg device is connected | Nikita Mikhailov | 2016-04-15 | 3 | -11/+27 |
| | | |||||
| * | OTG: Fix connection issues | Nikita Mikhailov | 2016-04-15 | 3 | -24/+17 |
| | | |||||
| * | OTG: Replace colons with dashes in usb error messages | Nikita Mikhailov | 2016-04-14 | 1 | -8/+8 |
| | | |||||
| * | OTG: rename Smartcard -> SecurityToken | Nikita Mikhailov | 2016-04-14 | 13 | -129/+127 |
| | | |||||
| * | OTG: rescan devices before next operation | Nikita Mikhailov | 2016-04-14 | 3 | -19/+58 |
| | | |||||
| * | OTG: Add copyright | Nikita Mikhailov | 2016-04-14 | 1 | -0/+17 |
| | | |||||
| * | OTG: fix icc powering method | Nikita Mikhailov | 2016-04-14 | 1 | -1/+1 |
| | | |||||
| * | OTG: Add/Update copyrights | Nikita Mikhailov | 2016-04-14 | 10 | -0/+143 |
| | | |||||
| * | OTG: Remove obsolete Pin classes, reenable changeKey method | Nikita Mikhailov | 2016-04-14 | 4 | -93/+24 |
| | | |||||
| * | OTG: move UsbConnectionDispatcher to utls package | Nikita Mikhailov | 2016-04-14 | 3 | -11/+7 |
| | | |||||
| * | OTG: UsbTransport minor refactoring | Nikita Mikhailov | 2016-04-14 | 1 | -11/+22 |
| | | |||||
| * | OTG: Add/update javadoc; rename methods, exceptions | Nikita Mikhailov | 2016-04-14 | 8 | -115/+173 |
| | | |||||
| * | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 8 | -72/+73 |
| | | |||||
| * | OTG: Refactor persistent connections, naming | Nikita Mikhailov | 2016-04-14 | 9 | -118/+132 |
| | | |||||
| * | OTG: Add support for persistent usb connection | Nikita Mikhailov | 2016-04-14 | 8 | -111/+132 |
| | | | | | | | | No need to reinsert token on each operation | ||||
| * | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 8 | -933/+108 |
| | | |||||
| * | OTG: Rename 'javacard' package, methods, remove JavacardInterface | Nikita Mikhailov | 2016-04-14 | 16 | -67/+770 |
| | | |||||
| * | OTG: Fix usb transport | Nikita Mikhailov | 2016-04-14 | 3 | -43/+108 |
| | | |||||
| * | OTG: Usb device manager fixes | Nikita Mikhailov | 2016-04-14 | 5 | -93/+74 |
| | | |||||
| * | OTG: Add usb device manager prototype | Nikita Mikhailov | 2016-04-14 | 5 | -28/+219 |
| | | |||||
| * | OTG: update methods | Nikita Mikhailov | 2016-04-14 | 8 | -707/+308 |
| | | |||||
| * | OTG: port old primitives from otg_alt branch | Nikita Mikhailov | 2016-04-14 | 11 | -0/+995 |
|/ | |||||
* | Remove old keybase path | Dominik Schürmann | 2016-04-13 | 1 | -1/+0 |
| | |||||
* | Version 3.95 beta | Dominik Schürmann | 2016-04-13 | 1 | -2/+2 |
| | |||||
* | Fix string | Dominik Schürmann | 2016-04-13 | 1 | -1/+1 |
| | |||||
* | KeybaseLib workaround | Dominik Schürmann | 2016-04-12 | 2 | -2/+5 |
| | |||||
* | Fix wrapper URL | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 |
| | |||||
* | Update Android Gradle Plugin to 2.0 with workarounds | Dominik Schürmann | 2016-04-12 | 7 | -19/+23 |
| | |||||
* | Merge branch 'backup-code' | Dominik Schürmann | 2016-04-12 | 9 | -189/+1605 |
|\ | |||||
| * | Fix in-app help for backup codes | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 8 | -188/+1604 |
| | | |||||
* | | Fix strings | Dominik Schürmann | 2016-04-12 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 4 | -10/+136 |
|\ | | | | | Handle encrypted files in "import key" file selection | ||||
| * | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 4 | -10/+136 |
| | | |||||
* | | Merge pull request #1828 from nmikhailov/holder_text_fix | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 |
|\ \ | | | | | | | Add missing keyholder string param | ||||
| * | | Add missing keyholder string param | Nikita Mikhailov | 2016-04-11 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'kepuss-okhttp3' | Dominik Schürmann | 2016-04-09 | 13 | -124/+165 |
|\ \ | |||||
| * | | Use cert pinning only if available | Dominik Schürmann | 2016-04-09 | 7 | -41/+36 |
| | | | |||||
| * | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 5 | -29/+41 |
| | | | |||||
| * | | Update keybase submodule | Dominik Schürmann | 2016-04-09 | 1 | -0/+0 |
| | | |