cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,686 Commits 1 Branch 0 Tags
2a96912a96f6b740c40331fb83f715d4d1abf597
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 2a96912a96 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 19:34:42 +02:00
Vincent Breitmoser fe1f5489ff consolidate: implement (mostly) recovery mode 2014-08-20 19:34:36 +02:00
Vincent Breitmoser 9aaaac068e consolidate: use KeychainProvider for deletion operation 2014-08-20 19:31:51 +02:00
Vincent Breitmoser 9930ab7f6f consolidate: a lot more log output, better recovery 2014-08-19 16:53:55 +02:00
Vincent Breitmoser 9fb1050fed stub for consolidate recovery in KeychainApplication 2014-08-19 15:56:53 +02:00
Vincent Breitmoser 0422d48b61 add ProgressFixedScaler (forgot in a previous commit) 2014-08-19 15:55:53 +02:00
Vincent Breitmoser a2ae318a1a add OpenDialogActivity (stub) 2014-08-19 15:55:40 +02:00
Vincent Breitmoser c725239a69 consolidate: split into two steps, can pick up at second step if anything fails 2014-08-19 15:45:59 +02:00
Vincent Breitmoser 6a3150d878 fix primary user id in master key flag modification 2014-08-19 14:42:40 +02:00
Vincent 56fb822034 Merge pull request #772 from mar-v-in/issue-729 
Remove NoSwipeWrapContentViewPager
 2014-08-17 15:46:27 +02:00
Vincent Breitmoser 14290c3ce9 consolidate: working implementation, lacking ui 2014-08-17 03:29:03 +02:00
Vincent Breitmoser aa625d4fbf parametrize FileImportCache for filename 2014-08-17 00:49:14 +02:00
Vincent Breitmoser c00343d516 modify*Key: improve handling of passphrase modification (add tests, too) 2014-08-16 21:04:43 +02:00
Vincent Breitmoser e38f6a2a46 use correct algorithm for signatures (actually fix heterogeneous subkeys) 2014-08-16 19:45:14 +02:00
Vincent Breitmoser 62b7d2d7d8 fix small log format string mistake for adding subkeys 
closes #768
 2014-08-16 19:31:26 +02:00
Vincent Breitmoser 2497722b48 fix travis tests (more), minor comment edits 2014-08-16 07:12:37 +02:00
Vincent Breitmoser 7c7ba21714 tests: add test for master key revocation 2014-08-16 07:06:07 +02:00
Vincent Breitmoser 6e84c72801 tests: more expected error types 2014-08-16 06:53:50 +02:00
Vincent Breitmoser de0d95432e typed expected failures and a couple minor things 2014-08-16 06:53:50 +02:00
Vincent Breitmoser a943bebfdf support for master key modifications, among other stuff 2014-08-16 06:53:50 +02:00
Vincent Breitmoser 1fa77d57d2 modifySecretKey: err out on "use previous" expiry date for (sub)key creation 2014-08-16 06:53:50 +02:00
Vincent Breitmoser c54fe21f44 modifySecretKey: err out on revocation of nonexistent user id 2014-08-16 06:53:50 +02:00
Vincent Breitmoser 0708b573fc test: even nicer code 2014-08-16 06:53:50 +02:00
Vincent Breitmoser 09d37a5fa6 fix keys with no expiry in ui code 2014-08-14 22:12:18 +02:00
Vincent Breitmoser 621978a7f5 explicitly add BouncyCastleProvider (fixes travis?) 2014-08-14 19:13:18 +02:00
Vincent Breitmoser 48935557e8 support changing expiry of subkeys to none 2014-08-14 19:12:29 +02:00
Vincent Breitmoser 6e7b999409 fix subkey certification canonicalization (why did the test not catch this?!) 2014-08-14 18:57:55 +02:00
Vincent Breitmoser 9af301ec77 handle modify and save errors in KeychainIntentResult 2014-08-14 17:12:17 +02:00
Vincent Breitmoser 9c03889390 tests: add ProviderHelperSaveTest, with long key id collision test 2014-08-14 17:10:40 +02:00
Vincent Breitmoser 2c408f679c dem logix 2014-08-14 16:34:57 +02:00
Vincent Breitmoser a19784ed7e merge: check fingerprints on merge operation! (this needs a testcase!) 2014-08-14 16:28:03 +02:00
Vincent Breitmoser d2b9e95c80 tests: cleaner code in PgpKeyOperationTest 2014-08-14 16:28:03 +02:00
Vincent Breitmoser d4240f73f5 delete unused PgpConversionHelper 2014-08-04 00:39:59 +02:00
Vincent Breitmoser 80ed3464f4 small fix for MSG_MF_UID_ADD log entry 2014-08-01 17:52:27 +02:00
Vincent Breitmoser f555447011 fix dumb mistake in modifySecretKey 2014-08-01 17:46:04 +02:00
Vincent Breitmoser 827a958e12 remove debug output about security providers (cleaner unit tests) 2014-08-01 17:00:08 +02:00
Vincent Breitmoser c0edaf9a5e make FileImportCache generic, iterable, and add unit test 2014-08-01 16:59:48 +02:00
Vincent Breitmoser 11e5261f07 move classes around a bit 2014-08-01 16:50:33 +02:00
Vincent Breitmoser faf3868f01 lowercase all key ids from keyserver 2014-07-31 23:49:53 +02:00
Vincent Breitmoser 3d7cdf5428 move upload/update buttons from menu to buttons 2014-07-31 23:49:53 +02:00
Vincent Breitmoser caad5d1fc1 fix bug in UploadKeyActivity, minor work on uri handling 2014-07-31 23:07:20 +02:00
Vincent Breitmoser c5ce794ef7 more fixes on canonicalization and progress 2014-07-31 22:36:25 +02:00
Vincent Breitmoser 58c2ca6eb8 completely overengineer progress indication in {modify,create}SecretKeyRing methods 2014-07-31 20:59:50 +02:00
Vincent Breitmoser d48e980946 avoid nullpointerexception in EditKeyResult 2014-07-31 19:27:26 +02:00
Vincent Breitmoser acb5a70e44 fix fromStream method, properly recognize multiple concatenated streams 2014-07-31 19:27:26 +02:00
Vincent Breitmoser b40081c364 always return an EditKeyResult in modifyKey method 2014-07-31 19:27:25 +02:00
Vincent Breitmoser a3c2eaf1e9 tests: adapt to new EditKeyResult return value 2014-07-31 19:27:25 +02:00
Vincent Breitmoser ecb2c2c2b1 reduce memory usage while parsing multiple keyrings from a stream 2014-07-31 18:25:46 +02:00
Vincent Breitmoser 33172d598d couple of logging fixes 2014-07-31 17:09:30 +02:00
Vincent Breitmoser b156a057e8 rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
Vincent Breitmoser 64aac8023e couple of fixes in save*KeyRing methods 2014-07-30 16:22:55 +02:00
Vincent Breitmoser 4457b4a24c fix a couple remaining AppMsgs 2014-07-29 14:00:36 +02:00
Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Vincent Breitmoser da131220aa watch out for nullpointers from get(Un|)HashedSubpackets 
fixes #721
 2014-07-28 17:09:56 +02:00
Vincent Breitmoser f4ee71e3ef introduce EditKeyResult with transient UncachedKeyRing (half-baked!) 2014-07-27 01:22:10 +02:00
Vincent Breitmoser a8782272b3 some more work on supertoast and result parcel stuff 2014-07-27 00:46:38 +02:00
Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Vincent Breitmoser 45722d7cfb canonicalize: couple of fixes 2014-07-26 22:16:33 +02:00
Vincent Breitmoser 13bfa3b487 test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize 2014-07-26 22:15:49 +02:00
Vincent Breitmoser 236a502ea7 generic UncachedKeyRing fixes 2014-07-26 15:51:35 +02:00
Vincent Breitmoser cf6e4254c7 test: add misc UncachedKeyRing tests 2014-07-26 15:51:21 +02:00
Vincent Breitmoser 1c00227c41 test: small code cleanup 2014-07-26 14:16:44 +02:00
Vincent Breitmoser d849b6d8a8 test: don't need commutativity parameter here after all 2014-07-26 04:38:30 +02:00
Vincent Breitmoser eab4c4ba8e test: (almost) full coverage for UncachedKeyRing.merge 2014-07-26 04:35:38 +02:00
Vincent Breitmoser 043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser 7296ac4849 UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings 2014-07-26 03:57:54 +02:00
Vincent Breitmoser 7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Vincent Breitmoser a1c163e993 tests: add a couple of UncachedKeyRing.merge tests 2014-07-26 03:48:13 +02:00
Vincent Breitmoser ab2b90342e test and fix: adding an empty user id should fail 2014-07-26 03:47:29 +02:00
Vincent Breitmoser f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
Vincent Breitmoser cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Vincent Breitmoser 299570f1b9 test: start with UncachedKeyRing.canonicalize tests 2014-07-19 02:12:04 +02:00
Vincent Breitmoser 19dc49153d use jacoco for test coverage 2014-07-19 01:31:34 +02:00
Vincent Breitmoser 6d9eaaabb2 work on test prepare script, make the whole thing optional 2014-07-18 19:05:38 +02:00
Vincent Breitmoser 64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) 2014-07-15 19:47:52 +02:00
Vincent Breitmoser 501d4b887a signatures: a revocation reason does NOT determine if a cert is a revocation type 2014-07-15 19:31:27 +02:00
Vincent Breitmoser 2f35e07c9e Merge remote-tracking branch 'origin/master' into external-test 2014-07-15 19:17:43 +02:00
Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged 2014-07-15 19:17:08 +02:00
Vincent d8f941fa70 Merge pull request #711 from open-keychain/external-test 
External test + working SaveKeyringParcel
 2014-07-15 17:40:21 +02:00
Vincent Breitmoser 858fe47d46 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-07-15 17:39:36 +02:00
Vincent Breitmoser bdde6a3bd8 test: use random string as passphrase 2014-07-13 16:38:27 +02:00
Vincent Breitmoser 50c91b0799 test: add UncachedKeyringTest, stub 2014-07-13 16:27:45 +02:00
Vincent Breitmoser 3479850ccc test: work on KeyringTestingHelper methods 2014-07-13 16:26:26 +02:00
Vincent Breitmoser f82093c666 modifyKey: error out on integrity check fails 2014-07-12 02:02:37 +02:00
Vincent Breitmoser ed0aec57bf test: more tests for different revocation cases 2014-07-12 02:02:03 +02:00
Vincent Breitmoser 22b0e5a1fc test: add test for bad key sanity check 2014-07-12 02:01:21 +02:00
Vincent Breitmoser 0e3327c65c createKey: better logging, handle empty user id case 2014-07-12 01:29:06 +02:00
Vincent Breitmoser d4c1b781db test: add algorithm choice tests 2014-07-12 01:28:27 +02:00
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
 2014-07-11 21:00:26 +02:00
Vincent Breitmoser d4fa2bbf47 test: make testing optional in build 2014-07-11 19:58:28 +02:00
Vincent Breitmoser 74f510e62b tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build 2014-07-11 19:20:05 +02:00
Vincent Breitmoser 65e75eed93 travis: try running tests separately with info output 2014-07-11 17:15:17 +02:00
Vincent Breitmoser faa8c2baa3 travis: get rid of lint 2014-07-11 16:39:31 +02:00
Vincent Breitmoser f18e4d109f tests: stronger subkey revocation test including re-certification 2014-07-11 16:17:17 +02:00
Vincent Breitmoser 20b28b5207 modifyKey: proper expiry check during SubkeyAdd 2014-07-11 15:42:02 +02:00
Vincent Breitmoser 46ef001b82 test: stronger SubkeyCreate tests 2014-07-11 15:41:34 +02:00
Vincent Breitmoser 7b195ac2e3 modifyKey: make SubkeyChange operations work 2014-07-11 15:20:16 +02:00
Vincent Breitmoser e7efd2c539 test: add SubkeyChange tests 2014-07-11 15:19:49 +02:00
Vincent Breitmoser e00c65ed82 test: onlyX vars are lists now, use them as such 2014-07-11 14:54:35 +02:00
Vincent Breitmoser aaecf13ce0 (whoops) 2014-07-11 13:55:44 +02:00