cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,231 Commits 1 Branch 0 Tags
dd5d3dbf4c72d06f88a1e9dfd23f841cea65f9ea
Commit Graph

54 Commits

Author SHA1 Message Date
Dominik Schürmann
53680b6213 Cleanup, fix advanced sharing 2015-10-15 21:48:01 +02:00
Dominik Schürmann
7384fa7f2b Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract 2015-10-15 19:37:08 +02:00
Vincent Breitmoser
6cf7e3e541 Merge branch 'master' into encrypted-export 2015-10-08 20:05:56 +02:00
Vincent Breitmoser
3bf653775b improve tests, get rid of some redundant checks 2015-10-08 19:55:28 +02:00
Vincent Breitmoser
81a462c2ac pgpdecryptverify: get rid of duplicate code path for binary signature verification 2015-10-08 19:54:50 +02:00
Vincent Breitmoser
ac28b6bbac test: add tests for detached and clearsign signatures 2015-10-08 18:36:55 +02:00
Dominik Schürmann
dfc396a44c Fix tests for min requirement of 2048 bits 2015-10-04 23:37:03 +02:00
Dominik Schürmann
dfce5449c2 Raise min asymmetric key length for all ciphers to 2048 bit 2015-10-04 22:46:21 +02:00
Vincent Breitmoser
7c79902a82 Merge branch 'master' into encrypted-export 2015-10-01 17:28:43 +02:00
Vincent Breitmoser
4f13dc4fc5 spongy: use version which doesn't skip bad signatures 2015-10-01 17:08:50 +02:00
Vincent Breitmoser
f461d6b1d8 decryptverify: add trivial detection of pgp ascii-armored data 2015-09-30 14:41:09 +02:00
Vincent Breitmoser
5f1259f3f7 export: improve stream handling, performance 2015-09-28 04:20:33 +02:00
Vincent Breitmoser
46e24058ba export: support encrypted export, first version 2015-09-28 00:03:11 +02:00
Vincent Breitmoser
676a863b14 export: more cleanup and splitting into subroutines 2015-09-26 03:39:52 +02:00
Vincent Breitmoser
f77a6a85ee mime: don't decrypt in mime parsing only test 2015-09-17 00:54:33 +02:00
Vincent Breitmoser
6624d1f830 mime: respect charset header (default to utf-8) 2015-09-16 19:54:57 +02:00
Vincent Breitmoser
326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
476d153db2 fix unit tests for new savePublicKeyRing method signature 2015-09-11 03:35:30 +02:00
Vincent Breitmoser
cb067f748b add test for signed binary data (#1507) 2015-09-10 21:38:37 +02:00
Vincent Breitmoser
79f6ade240 fix unit test for linked ids 2015-09-06 01:29:39 +02:00
Vincent Breitmoser
c1cc27366c move stray test file to correct position 2015-08-29 13:36:35 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Dominik Schürmann
775ef71ce1 Disable new failing test for now 2015-08-10 14:25:50 +02:00
Dominik Schürmann
acbb3edf9b Fix test cases, add test cases (still 1 failing) 2015-08-10 13:54:41 +02:00
Dominik Schürmann
57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Adithya Abraham Philip
771d654766 made mSignatureTime optional in CryptoOperationHelper 2015-07-15 07:34:03 +05:30
Dominik Schürmann
bceda47d12 Tests not working anymore on travis after using new annotation parameter 
Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0"

This reverts commit 85a47d22f9.
 2015-07-09 13:16:30 +02:00
Dominik Schürmann
85a47d22f9 Get rid of robolectric workaround by using new annotation in robolectric 3.0 2015-07-09 13:05:16 +02:00
Vincent Breitmoser
642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Vincent Breitmoser
a320affe86 tests: make sure encryption happens to all enc-capable subkeys 2015-07-07 17:16:11 +02:00
Vincent Breitmoser
922d4c6a96 fix PromoteKeyOperationTest 2015-07-06 01:20:55 +02:00
Adithya Abraham Philip
a5257ec71d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-06-30 22:12:16 +05:30
Dominik Schürmann
a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Adithya Abraham Philip
f64e1467ad split import and export ops 2015-06-27 01:21:52 +05:30
Vincent Breitmoser
0077891f1d Merge branch 'master' into v/multi-decrypt 2015-06-26 15:40:38 +02:00
Thialfihar
2857de4d5a Import R and BuildConfig explicitly 2015-06-26 14:56:47 +02:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02:00
Vincent Breitmoser
244f92ed57 Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-11 15:34:55 +02:00
Dominik Schürmann
7c32098211 Add missing WorkaroundBuildConfig 2015-06-11 00:32:18 +02:00
Dominik Schürmann
6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann
d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +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 Breitmoser
9320d2d8a2 use KeyringTestHelper.diffKeyrings method for unit test 2014-07-07 19:02:57 +02:00
Art O Cathain
22108cf4e2 actually canonicalize 2014-07-06 15:50:07 +01:00
Art O Cathain
80e09bd05e work in progress 2014-07-06 15:50:07 +01:00
Vincent Breitmoser
de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Art O Cathain
13f785d0b0 borrow tests from Haskell OpenPGP 2014-06-23 17:54:27 +01:00
Art O Cathain
a5d85b367d add OpenPGP-Haskell to test collateral 2014-06-23 17:54:27 +01:00