aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-0/+1
| | | | | | | |
* | | | | | | | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
| | | | | | | |
* | | | | | | | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-282-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes
* | | | | | | | check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1281
* | | | | | | | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
| | | | | | | |
* | | | | | | | Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-131-0/+2
| | | | | | | |
* | | | | | | | Bugfixes and changes based on feedbackJoey Castillo2015-05-131-5/+3
| | | | | | | |
* | | | | | | | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-132-51/+3
| | | | | | | |
* | | | | | | | Moved checks from fragment to operation, impoved logging.Joey Castillo2015-05-122-0/+26
| | | | | | | |
* | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-0/+30
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Externalize Parcelable cachingDominik Schürmann2015-04-101-59/+11
| | | | | | |
* | | | | | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-52/+6
| | | | | | |
* | | | | | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-304-70/+14
| | | | | | |
* | | | | | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-2/+0
| | | | | | |
* | | | | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-2/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+18
| | | | | |
* | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+0
| | | | | |
* | | | | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-2/+7
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-214-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | | | Reworked Notify classManoj Khanna2015-03-204-16/+16
| | | | | |
* | | | | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-212-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* | | | | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| | | | | |
* | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-201-1/+3
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-202-9/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | | | | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-192-8/+11
| | |_|_|/ | |/| | |
* | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-203-34/+11
| | | | |
* | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-193-8/+6
| | | | |
* | | | | yubikey certifications!Vincent Breitmoser2015-03-184-4/+85
| | | | |
* | | | | generalize nfc crypto input structureVincent Breitmoser2015-03-182-14/+4
|/ / / /
* | | | add support for certification of user attributesVincent Breitmoser2015-03-081-2/+2
| | | |
* | | | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
| |_|/ |/| |
* | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | | added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| | |/ | |/|
* | | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
* | | Fix root cause of #1077Morgan Gangwere2015-03-031-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 branchDominik Schürmann2015-02-271-0/+9
|\ \
| * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+9
| | |
* | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| | |
* | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-015-119/+198
| | | | | | | | | | | | | | | | | | | | | - 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 consolidateVincent Breitmoser2015-01-311-0/+1
| | |
* | | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-295-198/+96
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * | | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-195-198/+96
| | | |
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-273-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-272-0/+12
| | | | |
| * | | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-262-0/+5
| | | | |
* | | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-262-3/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 cleanupVincent Breitmoser2015-01-251-3/+3
| | | | |
| * | | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-252-0/+60
| | | | |
| * | | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-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