cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,152 Commits 1 Branch 0 Tags
573ea47a40d91b739181e59a5f39414feb9c97c6
Commit Graph

44 Commits

Author SHA1 Message Date
Vincent Breitmoser
573ea47a40 ditch safeslinger 2020-05-30 15:46:42 +02:00
Dominik Schürmann
8105cca6c1 Removed submodule openkeychain-api 2017-02-02 11:10:10 +01:00
Dominik Schürmann
2249b025bd Add ignore = dirty to submodules config 2016-02-09 18:05:41 +01:00
Dominik Schürmann
55b4790abd Add bouncycastle submodule 2016-02-09 00:22:20 +01:00
Dominik Schürmann
70662e21b0 Remove spongycastle submodule 2016-02-09 00:21:04 +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
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
dc81e0254c use snackbar from repository (again), and update to 2.11.0 
This release merged our pull requests for round corners on tablet for top line,
and nicer dismiss-on-swipe animation.

https://github.com/nispok/snackbar/pull/134
https://github.com/nispok/snackbar/pull/135
 2015-08-07 12:07:39 +02:00
Vincent Breitmoser
b59be903c3 Revert "Use snackbar lib from maven repo" 
This reverts commit bfc57aefa5.

Conflicts:
	OpenKeychain/build.gradle
	settings.gradle
 2015-07-14 14:37:29 +02:00
Dominik Schürmann
bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Dominik Schürmann
2512d3007e Switch to html-textview from JCenter 2015-04-12 18:13:03 +02:00
Dominik Schürmann
2050be3995 Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of git submodules 2015-03-30 16:08:25 +02:00
Vincent Breitmoser
8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
Dominik Schürmann
3da60c9ea3 Add ignore dirty to other git submodules 2015-03-15 18:47:56 +01:00
Ishan Khanna
32d934808b Fixed Spacing issue 2015-03-04 01:39:02 +05:30
Ishan Khanna
89ebb985fb This edit prevents some modules from throwing untracked content warning in git 2015-03-04 01:31:38 +05:30
Dominik Schürmann
c1130c5b3e Removed unused submodules 2015-03-02 16:24:26 +01:00
Dominik Schürmann
6b57afc350 Removed submodule android-lockpattern 2015-02-23 00:17:27 +01:00
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
700ee0f202 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:04:26 +02:00
Dominik Schürmann
dece50244b Add safeslinger submodule 2014-09-04 11:23:23 +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
e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
 2014-08-01 11:09:25 +02:00
mar-v-in
eae7c711a3 Merge branch 'master' into improve-file-more 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
 2014-07-31 23:19:01 +02:00
Vincent Breitmoser
8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Dominik Schürmann
d8ada7c1bb Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
 2014-07-18 09:47:24 +02:00
Dominik Schürmann
306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann
e531da4036 Add nfc lib 2014-07-16 10:22:51 +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
d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
mar-v-in
1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
Dominik Schürmann
9c1c51bf0c Removed submodule AndroidBootstrap 2014-06-30 22:04:13 +02:00
Dominik Schürmann
b34c744324 Change keybase submodule to our fork 2014-06-28 18:56:19 +02:00
Dominik Schürmann
9ce7d29a2d Merge submodules 2014-06-24 20:16:46 +02:00
mar-v-in
6c42fe58bd Add minidns submodule 2014-06-23 21:46:17 +02:00
mar-v-in
2cd4f7eb93 Remove dnsjava module 2014-06-23 21:44:49 +02:00
Art O Cathain
109f74a922 https for submodules 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
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Vincent Breitmoser
ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser
97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
mar-v-in
36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
Dominik Schürmann
ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann
f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00