cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,980 Commits 1 Branch 0 Tags
9d97d37c06f22354c124bd6cedd989d9ca4ff53e
Commit Graph

261 Commits

Author SHA1 Message Date
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +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
Adithya Abraham Philip
0251f0e416 introduced constants for keyserver sync, fixed sync issue 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +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
Vincent Breitmoser
6cbc0ceeae comment for database fix 2015-07-08 03:52:38 +02:00
Vincent Breitmoser
af546ae101 apply database fix for bogus rows introduced by issue #1402 2015-07-08 02:55:35 +02:00
Dominik Schürmann
e66794969e Package cert not sig 2015-07-07 22:15:15 +02:00
Vincent Breitmoser
17defe556a cleanup, NonNull annotation, never return null in PgpDecryptVerify 2015-07-06 00:52:53 +02:00
Vincent Breitmoser
539379a629 some cleanup and documentation 2015-07-06 00:10:54 +02:00
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
2402c6d3c7 ensuring code style is preserved 2015-07-03 20:46:15 +05:30
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
93e6b6f9b5 Use signature-level signature for TemporaryStorageProvider and describe the security model 2015-06-29 10:54:27 +02:00
Dominik Schürmann
99c06b085b Add brackets in KeychainProvider 2015-06-29 09:24:34 +02:00
Dominik Schürmann
5b320d01d0 Use application/octet-stream as default type in TemporaryStorageProvider 2015-06-29 07:58:00 +02:00
Adithya Abraham Philip
f64e1467ad split import and export ops 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
aa0bd4c9e0 introduced CryptoOperationHelper in ImportKeysActivity 2015-06-27 01:17:01 +05:30
Vincent Breitmoser
dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Vincent Breitmoser
51d35c7a83 instrument: first couple of tests for OpenPGP API 2015-06-26 01:59:11 +02:00
Vincent Breitmoser
8d141176bd fix original file deletion (and instrumentation) 2015-06-23 21:56:27 +02:00
Vincent Breitmoser
4135790161 fix decrypt view intents, save mimetype in storage provider, and thumbnail loading in decrypt list 2015-06-20 07:29:09 +02:00
Vincent Breitmoser
3b791f6633 add mimetype and streamtype support in TemporaryStorageProvider 2015-06-20 05:03:40 +02:00
Vincent Breitmoser
7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser
374b21410e Merge branch 'v/instrument' into v/multi-decrypt 
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2015-06-17 19:24:07 +02:00
Vincent Breitmoser
312cb38848 preliminary EditKeyTest 2015-06-17 18:52:59 +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
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser
fa61438306 multi-decrypt: implement save operation (missing actual copy) 2015-06-03 17:01:29 +02:00
Vincent Breitmoser
0d8370be1d rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel 2015-05-30 13:25:47 +02:00
Vincent Breitmoser
2bbb9b9608 update database to trigger consolidate 2015-05-28 22:43:10 +02:00
Vincent Breitmoser
c4d392051c improve robustness of SecretKeyType handling 2015-05-28 22:34:02 +02:00
Vincent Breitmoser
c8f788b925 set to stripped by default, rather than "unavailable" 2015-05-28 22:22:24 +02:00
Vincent Breitmoser
b2f32827c6 allow user packets with only revocation packet 2015-05-28 22:00:08 +02:00
Vincent Breitmoser
20a6c5ce8a Merge tag 'v3.2.1' into linked-identities 
Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Dominik Schürmann
0a29f6d3ac Cleanup 2015-05-10 11:52:39 +02:00
Dominik Schürmann
e14a2efcad Fixes and clarifications to app signature (or better certificate) pinning 2015-05-10 03:31:19 +02:00
Vincent Breitmoser
3600cda3bc linked-ids: rename RawLinkedIdentity to UriAttribute 2015-05-09 19:09:09 +02:00
William Faulk
eabc6cd8d4 use TemporaryStorageProvider for Bluetooth Share 2015-05-04 16:49:30 -04:00
Dominik Schürmann
4e425495e6 Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade 2015-05-04 13:57:43 +02:00
Vincent Breitmoser
4afd6b881e Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-15 20:02:57 +01:00
Dominik Schürmann
c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Vincent Breitmoser
a9a5551d95 remove notiion of nonce/identifier 2015-03-13 01:55:31 +01:00
Vincent Breitmoser
9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Dominik Schürmann
f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Vincent Breitmoser
159b197930 add linked id certs uri to KeychainProvider 2015-03-09 21:03:27 +01:00
Vincent Breitmoser
08fd2a2de3 use loader in LinkedIdViewFragment 2015-03-09 16:30:13 +01:00
Vincent Breitmoser
2b5023a75d Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-08 01:49:22 +01:00