cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,387 Commits 1 Branch 0 Tags
d849b6d8a83deed28e8a22da642db781c4e6cf6d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Breitmoser 1436ab8d90 SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00
Vincent Breitmoser bb92fe2804 test: get rid of some SaveKeyringParcel boilerplate 2014-07-11 13:49:17 +02:00
Vincent Breitmoser 26f6d58284 get rid of some inspection warnings 2014-07-11 13:45:06 +02:00
Vincent Breitmoser 4da273ac16 modifyKey: error out on nonexisting new primary user id 2014-07-11 13:35:48 +02:00
Vincent Breitmoser 4345e0309d test: add more user id tests 2014-07-11 13:29:13 +02:00
Vincent Breitmoser 9bae53f101 test: put more stuff in helper method for neater tests 2014-07-11 13:28:28 +02:00
Vincent Breitmoser d6f3b4b879 fix bug in canonicalization regarding subkey revocation 2014-07-11 03:27:44 +02:00
Vincent Breitmoser 036a886581 test: test subkey revocation 2014-07-11 03:27:28 +02:00
Vincent Breitmoser f6e39b0a97 modifyKey: couple more fixes from tests 2014-07-11 02:51:13 +02:00
Vincent Breitmoser e477577c55 some UncachedKeyRing fixes, primary user id mostly 2014-07-11 02:50:35 +02:00
Vincent Breitmoser 38ee6203ad modifyKey: preserve master key flags 2014-07-11 02:49:51 +02:00
Vincent Breitmoser dce2df4113 add come createKey strings 2014-07-11 02:48:54 +02:00
Vincent Breitmoser b406db24b7 test: implement a ton of PgpKeyOperation tests 2014-07-11 02:48:08 +02:00
Vincent Breitmoser d0ff2c9f28 test: fix RawPacket comparator 2014-07-11 02:47:26 +02:00
Vincent Breitmoser fa00a5b23c test: finish testSubkeyAdd 2014-07-10 21:00:17 +02:00
Vincent Breitmoser 0e7d4f644b Revert "test: add --info to travis thing, for testing" 
This reverts commit 7532baa6c7.
 2014-07-10 02:18:35 +02:00
Vincent Breitmoser 7532baa6c7 test: add --info to travis thing, for testing 2014-07-10 02:08:23 +02:00
Vincent Breitmoser 6f0e3c242a test: enable travis, disable dysfunctional tests to make it work 2014-07-10 01:56:21 +02:00
Vincent Breitmoser 90f546a4e8 tests: add testSubkeyAdd 2014-07-10 01:38:57 +02:00
Vincent Breitmoser 0afd979665 test: move uncachedkeyring test setup into BeforeClass method 2014-07-09 20:35:03 +02:00
Vincent Breitmoser a99589e9c4 use openjdk7 in travis 2014-07-09 17:41:13 +02:00
Vincent Breitmoser 09529bc47e tests: fix createkey test 2014-07-09 17:41:01 +02:00
Vincent Breitmoser a9c3d6b507 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
 2014-07-09 16:39:26 +02:00
Vincent Breitmoser 718acbf954 put unit tests into external module (CAVEAT) 
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
 2014-07-09 16:03:30 +02:00
Vincent 9fcc0a8816 Merge pull request #710 from mar-v-in/patch-1 
Fix OperationResultParcel
 2014-07-09 11:26:59 +02:00
Vincent BreitmoserandArt O Cathain 9971f9ad4c use KeyringTestHelper.diffKeyrings method for unit test 
Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
 2014-07-07 21:12:50 +01:00
Vincent BreitmoserandArt O Cathain 83e5a3d341 add diffKeyrings method 2014-07-07 21:08:48 +01:00
Vincent Breitmoser 9320d2d8a2 use KeyringTestHelper.diffKeyrings method for unit test 2014-07-07 19:02:57 +02:00
Vincent Breitmoser 23524af81d add diffKeyrings method 2014-07-07 18:52:59 +02:00
Vincent Breitmoser e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
 2014-07-07 18:19:52 +02:00
Vincent fed11b2647 Merge pull request #708 from artbristol/composition-not-inheritance 
Prefer composition to inheritance
 2014-07-06 20:39:05 +02:00
Vincent Breitmoser a920f9ce0c Merge remote-tracking branch 'origin/master' 2014-07-02 16:05:58 +02:00
Vincent Breitmoser 100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Vincent Breitmoser 6f558add35 use expert create key for key creation testing (revert this later on!) 2014-07-02 15:05:02 +02:00
Vincent Breitmoser 9fb92c8642 fix subkey addition 2014-07-02 15:03:28 +02:00
Vincent Breitmoser 858be93f3d update spongycastle to include addSubkeyBindingCertification 2014-07-02 15:02:11 +02:00
Vincent Breitmoser 144a10a3d0 forgot a line in previous commit 2014-07-02 14:53:25 +02:00
Vincent Breitmoser 287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
Vincent Breitmoser de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Vincent Breitmoser 6d7a9ec48a pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
Vincent Breitmoser 3acb7fb087 fix nullpointerexception in importkeyactivity 2014-06-28 20:54:13 +02:00
Vincent Breitmoser d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Vincent c865de4002 Merge pull request #686 from mar-v-in/minidns 
Use minidns instead of dnsjava
 2014-06-23 23:16:25 +02:00
Vincent Breitmoser 9f947aefe6 ditch outdated certifyKey operation 2014-06-22 14:46:14 +02:00
Vincent Breitmoser 4d091d1784 use arraylists instead of arrays in savekeyringparcel 2014-06-22 14:45:40 +02:00
Vincent Breitmoser 37cee1322b fix indentation in various key import methods 2014-06-22 14:17:08 +02:00
Vincent Breitmoser 002a391a68 Merge remote-tracking branch 'origin/master' 2014-06-22 13:42:03 +02:00
Vincent Breitmoser 22ea9c6047 fix parcel method in ParcelableKeyRing 2014-06-22 13:41:54 +02:00
Vincent Breitmoser 857b15cbd5 use hashcode instead of keyid in import list (keyids may not be unique!) 2014-06-22 13:32:07 +02:00
Vincent BreitmoserandDominik Schürmann 0d644e37b1 import: forward motion events to activity regardless 2014-06-20 22:30:54 +02:00
Vincent f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing 
Start on Robolectric integration test
 2014-06-20 00:44:31 +02:00
Vincent Breitmoser b40b429bc0 remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
Vincent BreitmoserandDominik Schürmann 5c6139f57a forward touch events to pager in import activity 2014-06-18 22:57:56 +02:00
Vincent Breitmoser ada6a12174 fix key export 2014-06-18 21:54:59 +02:00
Vincent Breitmoser 4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser 825f37eee4 Merge remote-tracking branch 'origin/master' 2014-06-18 21:14:39 +02:00
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00
Vincent Breitmoser 3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser f8d895dea4 consolidate: almost sane logging 2014-06-18 20:27:59 +02:00
Vincent Breitmoser 134f8471c0 consolidate: add key import routines with consolidation 2014-06-18 19:39:16 +02:00
Vincent Breitmoser f80228a08d consolidate: make it work 2014-06-18 14:02:21 +02:00