moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity
2,913 Commits 12 Branches 24 Tags 116 MiB
4e834d7833
Commit Graph

2913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
ad69e47cec Support for multiple hash algos 2014-08-14 14:50:13 +02:00
Dominik Schürmann
6da17ef6bb Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
 2014-08-14 13:31:01 +02:00
Dominik Schürmann
37edd0f390 API: Return metadata only for v4 api clients and above... 2014-08-14 13:10:38 +02:00
Dominik Schürmann
1a8606f194 API: Return metadata only for v4 api clients 2014-08-14 13:08:39 +02:00
Dominik Schürmann
2fa613ad62 Merge pull request #766 from mar-v-in/patch-1 
Handle keys without expiry date right
 2014-08-14 11:43:50 +02:00
Dominik Schürmann
d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
mar-v-in
b8f7dd5676 Handle keys without expiry date right 
Fixes #765
 2014-08-14 11:21:59 +02:00
Dominik Schürmann
f941431d63 Add user info dialog 2014-08-13 21:49:04 +02:00
Dominik Schürmann
c7d5b09286 Move certify action down into actions section 2014-08-13 21:23:01 +02:00
Dominik Schürmann
a20e019d5e Fix tests 2014-08-13 19:49:11 +02:00
Dominik Schürmann
32d63828c7 Fix tests 2014-08-13 19:36:22 +02:00
Dominik Schürmann
28b48506f6 Fix tests 2014-08-13 19:11:33 +02:00
Dominik Schürmann
db12f782f2 API: User interaction when account keys are deleted 2014-08-13 18:48:42 +02:00
Dominik Schürmann
38da2af0e8 Better error handling for passphrase cache if key is missing 2014-08-13 16:37:28 +02:00
Dominik Schürmann
e4c8674792 Merge pull request #760 from mar-v-in/fix-encrypt-intent 
Fix encrypt intent
 2014-08-13 13:20:21 +02:00
mar-v-in
f34597a3c0 remove bundle for symmetric/asymmetric fragment as it was useless 2014-08-13 13:02:30 +02:00
mar-v-in
e8b7bbd978 fix message and uri from encrypt intent 2014-08-13 12:48:02 +02:00
Dominik Schürmann
fd055a893b Fix DECRYPT_METADATA api 2014-08-12 17:04:11 +02:00
Dominik Schürmann
9682826193 update api lib 2014-08-12 15:51:29 +02:00
Dominik Schürmann
2bca58742b Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keys 
EncryptActivity: only show relevant keys
 2014-08-12 14:15:11 +02:00
mar-v-in
82a41a2f7c Only show relevant keys in encrypt, fix #756 #757 2014-08-12 13:56:30 +02:00
mar-v-in
80674021b5 Add convenience method to unified keyrings to determine whether a keyring is expired, fix is_revoked for certain usages 2014-08-12 13:54:56 +02:00
Dominik Schürmann
a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +02:00
mar-v-in
4fdf9ab486 Only show keyrings that have a valid sign key in from field, fixes #756 2014-08-12 12:57:08 +02:00
Dominik Schürmann
ae5e75f4e1 Implement EXTRA_ORIGINAL_FILENAME for API 2014-08-11 23:57:11 +02:00
Dominik Schürmann
acf5b99434 Update api lib 2014-08-11 21:26:52 +02:00
Dominik Schürmann
55d03f539e update api lib 2014-08-11 20:16:56 +02:00
Dominik Schürmann
abf50c3750 Support mime type in metadata 2014-08-11 20:16:21 +02:00
Dominik Schürmann
d5b40de70a Decrypt metadata api 2014-08-11 17:29:41 +02:00
Dominik Schürmann
59096b37fd Support API versions 3 and 4 2014-08-11 17:22:53 +02:00
Dominik Schürmann
82e66cd5b8 Update api lib 2014-08-11 17:19:58 +02:00
Dominik Schürmann
b673565035 Get original filename for decryption 2014-08-11 17:10:47 +02:00
Dominik Schürmann
549feb69ed Add option to pass original filename to PgpSignEncrypt 2014-08-11 10:00:24 +02:00
Dominik Schürmann
94b7b1b5d8 progress for signing binary 2014-08-11 09:55:24 +02:00
Dominik Schürmann
867b89be0a More fixes for decryption progress 2014-08-11 01:31:51 +02:00
Dominik Schürmann
13f86890d6 Handle missing MDC as failed only if no valid signature is present 2014-08-10 21:50:46 +02:00
Dominik Schürmann
33a4d68520 More fixes for decryption progress 2014-08-10 21:09:10 +02:00
Dominik Schürmann
c981902aba Handle missing integrity protection MDC packet as if integrity check would have failed. 
An attacker could strip the MDC on its way to the receiver...
 2014-08-10 20:59:13 +02:00
Dominik Schürmann
b0821a3ddd Introduction of metadata api, starting to fix decryption progress 2014-08-10 20:44:02 +02:00
Dominik Schürmann
1abae04cda Fix compression setting for encryption of files 2014-08-10 20:27:34 +02:00
Dominik Schürmann
65fd0de7e1 passphrase instead of pass phrase 2014-08-07 11:17:58 +02:00
Dominik Schürmann
d4105420f7 Pull from transifex 2014-08-07 10:01:57 +02:00
Dominik Schürmann
a908c7de67 Readd missing string 2014-08-07 10:01:42 +02:00
Dominik Schürmann
4934c25fea Move design doc into wiki 2014-08-07 09:29:01 +02:00
Dominik Schürmann
bac767d184 Edit key: prevent the combination of change to primary user id and revocation 2014-08-07 08:51:56 +02:00
Dominik Schürmann
ef67962c5d Info about travis test failings 2014-08-06 08:05:59 +02:00
Dominik Schürmann
881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
 2014-08-06 01:08:12 +02:00
Dominik Schürmann
6ba7536838 ModernPGP infos 2014-08-06 00:59:38 +02:00
Dominik Schürmann
8b0c389b1b Update changelog and about 2014-08-06 00:32:04 +02:00
Dominik Schürmann
9b1efdcdad Start with changelog 2014-08-06 00:20:08 +02:00