Commit Graph

112 Commits

Author SHA1 Message Date
Dominik Schürmann 6e326fb000 Add self-encrypt for old API 2015-05-10 03:00:42 +02:00
Dominik Schürmann 7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Dominik Schürmann 3668c8897d Fix YubiKey naming, cleanup 2015-04-15 10:02:41 +02:00
Dominik Schürmann 256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Dominik Schürmann 7074b44347 Cache CryptoInputParcel in OpenPgpService 2015-04-10 15:58:37 +02:00
Dominik Schürmann a467480717 Fix signing subkey selection in remote service 2015-04-07 13:49:34 +02:00
Vincent Breitmoser ad69622b69 fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) 2015-04-01 00:39:32 +02:00
Vincent Breitmoser 6cc7b6141a update OpenPgpApi, re-add EXTRA_PASSPHRASE 2015-03-30 23:56:09 +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
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
Dominik Schürmann 10f9dcd7a1 Add TODO to remote API 2015-03-21 15:43:36 +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
Dominik Schürmann ebf9bb3a63 Fix API RESULT_TYPE 2015-03-20 13:51:06 +01:00
Dominik Schürmann 9e668eadcb Fix PASSPHRASE handling in API 2015-03-20 13:38:07 +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 aca54e31ea generalize nfc crypto input structure 2015-03-18 18:25:44 +01:00
Dominik Schürmann f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann 3fe7fa202c API: If signature key is known return pi to show key 2015-03-09 17:12:46 +01:00
Dominik Schürmann b2e5ac2820 Fix colors for remote activity 2015-03-09 16:55:23 +01:00
Dominik Schürmann e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann c0aabbeb3c Use no compression in API for now 2015-03-05 10:56:27 +01:00
Dominik Schürmann c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +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
Dominik Schürmann a346b58db7 Close FileDescriptors and input, output streams when possible 2015-01-29 12:44:06 +01:00
Dominik Schürmann ae7ba2639f Support verification of detached signatures 2015-01-27 13:00:28 +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 6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Dominik Schürmann fc786280fd Fixes for detached signatures 2015-01-26 17:33:40 +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
Dominik Schürmann 1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00
Dominik Schürmann 94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Vincent Breitmoser ee4d911baf make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation 2014-10-13 15:02:42 +02:00
Vincent Breitmoser fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00
Dominik Schürmann 7646baf486 Better handling if no api key is selected 2014-10-09 01:51:35 +02:00
Dominik Schürmann 45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00
Dominik Schürmann b3f56c927b Revert "Replace PgpGeneralException with NotFoundException where appropriate"
This reverts commit 49b4ff6312.
2014-10-09 00:59:45 +02:00
Dominik Schürmann 49b4ff6312 Replace PgpGeneralException with NotFoundException where appropriate 2014-10-09 00:58:07 +02:00
Vincent Breitmoser 228e5653f9 one more fix for getting the right subkey in api signing 2014-10-03 13:25:25 +02:00
Vincent Breitmoser 37cb5c4c78 make getSignId a secret key operation, and respect unavailable keys
This one should remedy #811, but waiting for a test
2014-10-02 19:26:07 +02:00
Dominik Schürmann 84fcbba74d check key ids when used from api 2014-10-01 10:48:28 +02:00
Vincent Breitmoser 384724f9b5 request passphrase for correct subkey in OpenPgpService
fixes #811, hopefully
2014-09-30 00:51:25 +02:00
Dominik Schürmann 654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +02:00
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann 0182f7c951 Yubikey text decryption working 2014-09-24 00:57:57 +02:00
Dominik Schürmann 07704c2726 Yubikey decryption 2014-09-24 00:50:58 +02:00
Vincent Breitmoser 070017b12f passphrasecache: cache by master key, introduce preference for cache by subkey 2014-09-23 15:56:48 +02:00
Dominik Schürmann a454bfd701 Use key icons in import, prettify items 2014-09-18 22:05:27 +02:00
Dominik Schürmann a77c217b82 Fixes for nfc decrypt 2014-09-18 15:28:51 +02:00