Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 |
| | |||||
* | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 |
| | |||||
* | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -1/+1 |
| | | | | PgpDecryptVerify changes | ||||
* | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
| | | | | Fixes #1281 | ||||
* | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 |
| | |||||
* | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
| | |||||
* | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 1 | -5/+3 |
| | |||||
* | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -0/+3 |
| | |||||
* | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 1 | -0/+5 |
| | |||||
* | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 1 | -59/+11 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
| | |||||
* | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -13/+13 |
| | | |||||
* | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 1 | -7/+15 |
| | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | ||||
* | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 |
| | | |||||
* | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+3 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -1/+1 |
|/ | |||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+2 |
| | |||||
* | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| | |||||
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 |
| | | |||||
* | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
| | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant. | ||||
* | | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 |
|/ | | | | | | | | | | | | | | | | | When importing lots of keys, lots of messages about the status of keys is generated, including some debug slime and general fluff that isn't really needed a lot of the time. As a result, a serious bug can come along after key imports or certain operations which cause a log to become parceled. This commit implements a pool to "dehydrate" logs into: they are placed into the pool (a ConcurrentHashMap) and a UUID assigned to them, which is parceled along. When the OperationResult is un-parceled, it reads in the appropriate UUID bits and rehydrates the appropriate log. In order to avoid any memory leaks, the log pool removes a reference to the log itself, allowing the log to die a natural death at the hands of the GC.. | ||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -0/+9 |
|\ | |||||
| * | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -0/+9 |
| | | |||||
* | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 |
| | | |||||
* | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -29/+36 |
| | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -38/+29 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
| * | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 1 | -38/+29 |
| | | | |||||
* | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 1 | -0/+1 |
| | | | |||||
* | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -0/+1 |
| | | | |||||
* | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -3/+3 |
| | | | |||||
* | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+7 |
| | | | |||||
* | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 |
| | | |||||
* | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+12 |
| | | |||||
* | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+2 |
| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
* | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -0/+15 |
| | | |||||
* | | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | |||||
* | | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | |||||
* | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -0/+8 |
| | | |||||
* | | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -6/+8 |
| | | |||||
* | | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -0/+2 |
| | | |||||
* | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+1 |
| | | |||||
* | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -1/+3 |
|/ | | | | notation packet | ||||
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | Closes #978 | ||||
* | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | Fixes #974 |