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

73 Commits

Author SHA1 Message Date
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
8714a5eac4 add test for CharsetVerifier 2016-02-23 14:17:00 +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
KB Sriram
36bffc3ef5 Always revoke subkeys with a revocation signature. 
Unlike UID revocations which are "reversible" by newer UID
self-signatures, a subkey revocation should be "permanent" even if
followed by a newer self-signature.

The RFC is ambiguous on this, but this is the convention used by (e.g.)
GnuPG. The rationale for this behaviour is available as comments within
the GnuPG source.

UID signatures:
50c98c7ed6/g10/getkey.c (L1668-L1674)
Subkey signatures:
50c98c7ed6/g10/getkey.c (L1990-L1997)
 2016-01-15 15:28:40 -08: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
Dominik Schürmann
b84c9a8fb6 Update spongycastle to 1.53 2015-12-22 13:31:55 +01:00
Vincent Breitmoser
c9d93785b2 some work on benchmark operation (affects only debug build) 2015-12-13 00:31:51 +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
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