Dominik Schürmann
a45aaa2277
Fix import of keyring with pub+sec key with same key id
2015-05-06 04:10:27 +02:00
Dominik Schürmann
3668c8897d
Fix YubiKey naming, cleanup
2015-04-15 10:02:41 +02:00
Dominik Schürmann
71024460cb
Reformat comment in PassphraseCacheService
2015-04-13 23:53:46 +02:00
Dominik Schürmann
256d644d03
IMplement CryptoInputParcelCacheService
2015-04-13 23:29:35 +02:00
Dominik Schürmann
9fc001c9b9
Clearer var naming
2015-04-12 21:23:59 +02:00
Dominik Schürmann
4a55308741
More simplifications to PassphraseCacheService
2015-04-12 20:12:10 +02:00
Dominik Schürmann
c3d6637e6a
Simplify PassphraseCacheService
2015-04-12 19:55:10 +02:00
Vincent Breitmoser
ad69622b69
fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)
2015-04-01 00:39:32 +02:00
Dominik Schürmann
cc44ff1a8b
Prepare decrypt UI for input parcel
2015-03-31 15:44:37 +02:00
Vincent Breitmoser
39b131c7e5
fix Encrypt* with RequiredInputParcel
2015-03-30 23:35:32 +02:00
Vincent Breitmoser
d7b79e55fb
pass CryptoInputParcel independently for SignEncryptOperation
2015-03-30 16:40:41 +02:00
Dominik Schürmann
040cf42cb0
Merge branch 'development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
2015-03-24 13:19:43 +01:00
Dominik Schürmann
54cd414693
Merge pull request #1166 from adithyaphilip/multi-threaded
...
Multi-threaded key import, update all feature
2015-03-23 15:38:57 +01:00
Dominik Schürmann
aa3565b857
Fix passphrase cache not clearing all passphrases
2015-03-23 15:38:02 +01:00
Adithya Abraham Philip
9f5581463f
shifted multi-threading to own service
...
added multi-threaded cloud import, restored KeychainIntentService
eliminated code duplication in multi-threaded import
2015-03-23 15:37:05 +05:30
Adithya Abraham Philip
19775c399b
introduced multi-threading
...
refactored oldKeys to updatedKeys
added update all keys, ThreadPoolExecutor
used modified CachedThreadPoolExecutor
2015-03-23 15:34:22 +05:30
Vincent Breitmoser
c694d73cab
further improve yubikey error handling
2015-03-23 01:48:44 +01:00
Vincent Breitmoser
2151411219
actually promote to divert, pass yubikey's AID
2015-03-22 03:58:01 +01:00
Vincent Breitmoser
1ad3635d13
work on ad-hoc yubikey import support
2015-03-21 19:52:10 +01:00
Vincent Breitmoser
9ef2795fcd
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
Vincent Breitmoser
93c7eb72fb
more data in RequiredInputParcel, OperationResult notifications
...
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
2015-03-21 15:16:32 +01:00
Vincent Breitmoser
88ca41d555
add edit key unit test for no-op
2015-03-20 18:55:16 +01:00
Vincent Breitmoser
3e51da3afa
fix unit tests (for real)
2015-03-20 18:45:00 +01:00
Manoj Khanna
4e4b8efd6e
Reworked Notify class
2015-03-20 19:49:42 +05:30
Vincent Breitmoser
e00ce86de9
fix more unit tests (syntax)
2015-03-20 14:57:38 +01:00
Vincent Breitmoser
879efc2c70
fix unit tests (syntax)
2015-03-20 14:21:55 +01:00
Vincent Breitmoser
abce05d529
Merge remote-tracking branch 'origin/development' into development
...
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
2015-03-20 14:01:07 +01:00
Vincent Breitmoser
3b04636f5d
support yubikeys in (some) edit key operations
2015-03-20 02:28:22 +01:00
Vincent Breitmoser
25d89b5550
generalize NfcOperationParcel to RequiredInputParcel, including passphrases
2015-03-19 14:21:30 +01:00
Dominik Schürmann
9c9f95c7ac
New Passphrase class for safer passphrase handling in memory
2015-03-19 03:03:46 +01:00
Vincent Breitmoser
d46fc3740b
yubikey certifications!
2015-03-18 21:12:31 +01:00
Vincent Breitmoser
aca54e31ea
generalize nfc crypto input structure
2015-03-18 18:25:44 +01:00
Vincent Breitmoser
4499caef1e
introduce CryptoOperationParcel for nfc data
2015-03-18 14:06:59 +01:00
danielnelz
52200edfd7
Fixed possible ArrayIndexOutOfBoundsException.
2015-03-11 21:32:20 +01:00
danielnelz
7d27faf00c
Added braces to if else.
2015-03-09 20:14:11 +01:00
danielnelz
17301be2ca
Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType
...
in KeychainIntentService and replaced int constants with them. Fixed some
typos.
2015-03-09 20:09:05 +01:00
Vincent Breitmoser
30ca8637ff
add support for certification of user attributes
2015-03-08 01:46:30 +01:00
Vincent Breitmoser
80c159056d
show refresh key progress inline
2015-02-27 22:46:48 +01:00
Dominik Schürmann
6dce7c88d8
Merge keybase-proof branch
2015-02-27 01:18:18 +01:00
Vincent Breitmoser
7b24ee7b55
rewrite PgpSignEncrypt data flow
...
- 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
2015-02-01 23:14:26 +01:00
Vincent Breitmoser
5466d1e980
prevent recursive consolidate
2015-01-31 18:49:00 +01:00
Dominik Schürmann
6c6201f129
Fix cleartext signatures internally
2015-01-27 17:13:54 +01:00
Dominik Schürmann
e8780b4410
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Vincent Breitmoser
2bb7c3bcef
move last parts of import logic from kis into operation
2015-01-26 16:33:10 +01:00
Dominik Schürmann
34a7728cec
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Vincent Breitmoser
8d9c3c0534
lift language level to java 7, and some code cleanup
2015-01-25 12:36:00 +01:00
Vincent Breitmoser
41aba69fad
introduce PromoteKeyOperation to create dummy secret from public keys
2015-01-25 02:08:07 +01:00
Vincent Breitmoser
1516f951b7
work on divert-to-key and other keyring stuff
...
- 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
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
fb2fa195bf
allow explicit re-certification in SaveKeyringParcel
2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
