Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 2 | -10/+18 |
| | |||||
* | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -8/+0 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | 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 | 10 | -131/+346 |
| | | | | | | | | | | | | | | - 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 | 5 | -198/+96 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
| * | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 5 | -198/+96 |
| | | | |||||
* | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 4 | -3/+62 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 2 | -0/+12 |
| | | | | |||||
| * | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 3 | -3/+50 |
| | | | | |||||
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 7 | -7/+207 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 4 | -6/+5 |
| | | | | |||||
| * | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 5 | -1/+170 |
| | | | | |||||
| * | | | 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 |
| | | | |||||
* | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 1 | -0/+16 |
|/ / | |||||
* | | minor stuff | Vincent Breitmoser | 2015-01-03 | 1 | -3/+4 |
| | | |||||
* | | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 2 | -0/+7 |
| | | |||||
* | | 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 | 4 | -15/+208 |
| | | |||||
* | | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 2 | -14/+27 |
| | | |||||
* | | 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 | ||||
* | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 |
| | |||||
* | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| | |||||
* | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 |
| | |||||
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 2 | -0/+6 |
| | | | | Closes #978 | ||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 3 | -7/+39 |
| | |||||
* | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | Fixes #974 | ||||
* | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -3/+10 |
| | |||||
* | more rewording | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 |
| | |||||
* | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -0/+4 |
| | |||||
* | change indentation of import logs | Vincent Breitmoser | 2014-10-25 | 1 | -10/+10 |
| | |||||
* | more work on import logging | Vincent Breitmoser | 2014-10-25 | 1 | -1/+2 |
| | |||||
* | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 2 | -23/+49 |
| | |||||
* | Fix import from cloud | Dominik Schürmann | 2014-10-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-23 | 1 | -6/+81 |
|\ | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -6/+81 |
| | | |||||
* | | Externalize QR Code scanning and import into its own activity for better ↵ | Dominik Schürmann | 2014-10-23 | 1 | -0/+2 |
|/ | | | | code separation |