cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,396 Commits 1 Branch 0 Tags
2d38079574381ddafc47bd1f31dc6e35a2d67b6a
Commit Graph
358 Commits
Author SHA1 Message Date
Vincent Breitmoser 2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser 5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-12-30 13:09:27 +01:00
Vincent Breitmoser 2223cdd405 some small notation data fixes 2014-12-30 13:07:56 +01:00
Vincent Breitmoser 438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Vincent Breitmoser 576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Dominik Schürmann a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Vincent Breitmoser 082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Vincent Breitmoser 510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02: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 b9c0504465 remove unnecessary (and buggy) BufferedInputStream wrapping 2014-10-25 22:20:55 +02:00
Vincent Breitmoser 748049fb5b slightly change wording in merge logs 2014-10-25 02:50:48 +02:00
Vincent Breitmoser 30d0afa363 change the way merging is logged 2014-10-25 02:45:16 +02:00
Dominik Schürmann d09d4296da Silently fail on import on key import with ArrayIndexOutOfBoundsException 2014-10-16 13:36:21 +02:00
Vincent Breitmoser b6c7231a7f some cleanup and documentation of *Operation classes 2014-10-15 16:57:23 +02:00
Vincent Breitmoser ee4d911baf make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation 2014-10-13 15:02:42 +02:00
Vincent Breitmoser b47412eb1e CertifyOperation is not a Pgp- operation 2014-10-12 19:22:34 +02:00
Vincent Breitmoser fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00
Vincent Breitmoser 45dcc7d070 move operations into ops package, introduce BaseOperation class 2014-10-10 19:31:43 +02:00
Vincent Breitmoser 73ccff9537 Merge remote-tracking branch 'origin/development' into development 2014-10-09 16:26:38 +02:00
Vincent Breitmoser 340ed7c08d Merge remote-tracking branch 'origin/master' into development 2014-10-09 16:25:53 +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
Dominik Schürmann 3165f3ffa8 Remove unnecessary exception 2014-10-08 18:33:01 +02:00
Dominik Schürmann 0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann 678265483a Move utf8 check for user id upwards 2014-10-07 18:11:12 +02:00
Dominik Schürmann 27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Vincent Breitmoser 34345cf237 use sub results in import 2014-10-05 11:11:16 +02:00
Vincent Breitmoser 6699917279 add support for second line in log view 2014-10-05 11:10:40 +02:00
Vincent Breitmoser 2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:16:58 +02:00
Dominik Schürmann 9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser 0ffa1b94de certify: get rid of fingerprint check 
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
 2014-10-04 18:30:14 +02:00
Vincent Breitmoser d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Vincent Breitmoser 0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Vincent Breitmoser ba018d1f1b yubikey: check with correct subkey id for sign operation 2014-10-04 15:13:38 +02:00
Vincent Breitmoser ff144c7c11 canonicalize: compare user ids as string rather than bytes 2014-10-04 11:14:02 +02:00
Vincent Breitmoser 662cc53859 clean up PgpImportExport a bit 2014-10-03 04:25:00 +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 a125b51b1c Fix nullpointer with getS2K() 2014-10-02 12:33:56 +02:00
Dominik Schürmann e7cbf975ac More debugging output 2014-10-01 14:14:50 +02:00
Vincent Breitmoser 51ecce510f fix minor logic error (haha) 2014-09-30 14:10:54 +02:00
Vincent Breitmoser b2b19d7b2b pass (encryption) key id from Decrypt*Fragment to NfcActivity 2014-09-30 02:14:28 +02:00
Vincent Breitmoser 11d0f4510b pass key id for check from EncryptActivity to NfcActivity 2014-09-30 02:03:17 +02:00
Vincent Breitmoser c34a159cae fix method visibility for tests 2014-09-28 15:17:09 +02:00
Vincent Breitmoser 8131daa638 move can.*() methods to CanonicalizedPublicKey, where they belong 2014-09-28 14:50:52 +02:00