cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,394 Commits 1 Branch 0 Tags
bef3e621118d0e4d8fadedf0c9d67b6a9ff41883
Commit Graph
2394 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann bef3e62111 update lib 2014-07-22 18:30:21 +02:00
Dominik Schürmann bf10eb91b7 Remove support for V3 signatures 2014-07-22 18:24:12 +02:00
Dominik Schürmann e4e8bc5e07 Cleanup 2014-07-22 18:14:17 +02:00
Dominik Schürmann 878b5eb5ad Add values for NFC support 2014-07-22 18:10:22 +02:00
Dominik Schürmann 99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00
Dominik Schürmann afd6851e5b Fix test 2014-07-21 15:25:09 +02:00
Dominik Schürmann 2f5c73746d Merge branch 'master' into yubikey 2014-07-21 15:11:59 +02:00
Dominik Schürmann 976b232946 update nfc lib 2014-07-21 15:11:30 +02:00
Dominik Schürmann d882572f0d NFC Yubikey: only pass through hash of message and not whole content 2014-07-21 15:10:29 +02:00
Vincent Breitmoser f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
Dominik Schürmann 527c3e93f8 Update README.md 2014-07-19 15:16:45 +02:00
Dominik Schürmann 207870af1d Update README.md 2014-07-19 15:15:31 +02:00
Dominik Schürmann 8385c9c9dd Update README 2014-07-19 15:14:20 +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
Dominik Schürmann a10f582513 Merge branch 'master' into yubikey 2014-07-18 09:56:39 +02:00
Dominik Schürmann 94e56a4542 Merge branch 'da-kid-master' 2014-07-18 09:49:51 +02:00
Dominik Schürmann b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Dominik Schürmann d8ada7c1bb Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
 2014-07-18 09:47:24 +02:00
Dominik Schürmann 306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann 3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Daniel Albert cc63b0e72c Fixed gitmodules 2014-07-17 22:00:24 +02:00
Daniel Albert db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00
Dominik Schürmann 69c38c3f34 Update lib 2014-07-17 21:14:42 +02:00
Daniel Albert 8a8d8c5a68 Fixed unescaped apostrophe 2014-07-17 20:53:10 +02:00
Dominik Schürmann 45611a33fb Update libs 2014-07-17 20:30:41 +02:00
Dominik Schürmann f2a6064e38 Fixes 2014-07-17 20:29:07 +02:00
Daniel Albert 01046fc0e7 Added description to Setting, Changed title to suggested one 2014-07-17 20:01:53 +02:00
Daniel Albert f15df98ab5 Hopefully fixes Travis build errors 2014-07-16 19:59:55 +02:00
Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
 2014-07-16 18:49:16 +02:00
Daniel Albert e375cde7e1 Final Commit for #662 2014-07-16 18:17:46 +02:00
Dominik Schürmann 3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
Dominik Schürmann e531da4036 Add nfc lib 2014-07-16 10:22:51 +02:00
Dominik Schürmann 82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann 77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann 57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Vincent Breitmoser 64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) 2014-07-15 19:47:52 +02:00
Dominik Schürmann 848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +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
Dominik Schürmann 503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann 72237a0892 some fixes for edit 2014-07-15 19:22:40 +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
Dominik Schürmann e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +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