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

49 Commits

Author SHA1 Message Date
Vincent Breitmoser
52b1016baa update OpenPgpSignatureResult to use enums 2016-11-21 16:05:42 +01:00
Dominik Schürmann
ac1c20f961 Update build environment to SDK 24 2016-08-15 08:37:23 +02:00
Vincent Breitmoser
dab4edb24e inputdataoperation: Only consider data MIME if Content-Type header is present 2016-07-24 15:13:43 +02:00
Alex Fong
614f46a630 Shifted duplicate method implementations from KeyRing to openpgp-api submodule 2016-05-15 23:26:09 +08:00
Andrea Torlaschi
c942d8b2ff PgpSignEncryptOperation refactoring 2016-05-10 23:38:11 +02:00
Alex Fong
bc3aa44b22 Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel 2016-05-05 07:57:20 +08:00
Alex Fong
f43edcdd7a Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel. 2016-05-05 07:57:20 +08:00
Alex Fong
525788359c (WIP) Change password when key is stripped #1692 
Approach:
Find the first unstripped secret key and use it for passphrase verification
All unstripped keys will have their passphrase changed to new passphrase, if possible.

Current Progress:
Changing the passphrase of keys works fine.
Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword"
may be possible if given the go-ahead.
 2016-05-04 22:36:23 +08:00
Dominik Schürmann
0ef59e36ad Merge pull request #1816 from fiaxh/no_name_choose_email 
Correctly handle keys only having an email address
 2016-04-29 21:40:00 +02:00
Nikita Mikhailov
28a352a288 OTG: Rename smartcard -> security token 2016-04-15 02:02:11 +06:00
Nikita Mikhailov
38a1c2d3ab OTG: refactor, change nfc prefix to smartcard 2016-04-14 22:48:01 +06:00
fiaxh
6881754062 Better handle user_id sidecases while splitting 2016-04-12 13:30:43 +02:00
Vincent Breitmoser
c917262957 get rid of code path for pin and notation data handling 2016-03-23 17:49:26 +01:00
Vincent Breitmoser
03e695c650 ditch isLikelyText flag, set mimeType to text/plain in that case 2016-02-23 15:01:22 +01:00
Vincent Breitmoser
daf243082c externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata object 2016-02-22 21:58:31 +01:00
Vincent Breitmoser
bdae99c084 mime: try to decode with given charset or utf-8 while file is read 2016-02-22 17:03:24 +01:00
Vincent Breitmoser
da6dfb57a0 Merge branch 'master' into performance 2016-02-10 17:36:02 +01:00
Dominik Schürmann
79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Vincent Breitmoser
6a7652c0d7 performance: fix unit tests 2016-02-05 16:10:47 +01:00
Dominik Schürmann
0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Dominik Schürmann
6197870e24 Tests: Use ECC where possible 2016-01-03 23:10:31 +01:00
Vincent Breitmoser
89d1b6e4dc fix unit tests (IllegalStateException) 2015-11-16 00:05:02 +01:00
Vincent Breitmoser
8f41f56ca1 decrypt: add tests for skipping stripped and unsuitable decryption subkeys 2015-11-13 17:40:11 +01:00
Dominik Schürmann
7384fa7f2b Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract 2015-10-15 19:37:08 +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
4f13dc4fc5 spongy: use version which doesn't skip bad signatures 2015-10-01 17:08:50 +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
cb067f748b add test for signed binary data (#1507) 2015-09-10 21:38:37 +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
Dominik Schürmann
a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +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