moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-04 08:15:02 -05:00
Code Issues Releases Wiki Activity
3,481 Commits 12 Branches 24 Tags 116 MiB
e8780b4410
Commit Graph

103 Commits

Author SHA1 Message Date
Dominik Schürmann
e8780b4410 Merge branch 'development' into detached-sigs-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2015-01-27 09:46:42 +01:00
Vincent Breitmoser
1516f951b7 work on divert-to-key and other keyring stuff 
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
 2015-01-25 01:57:58 +01:00
Vincent Breitmoser
0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Dominik Schürmann
318d3eb120 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 00:04:10 +01:00
Vincent Breitmoser
33ab856214 update spongycastle with more public methods for WrappedUserAttribute 2015-01-13 20:53:38 +01:00
Dominik Schürmann
2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Dominik Schürmann
374de7ed96 Update safeslinger lib 2015-01-12 15:38:16 +01:00
Vincent Breitmoser
b52fb90380 fix and test for bad certificate version numbers (#1012) 
closes #1012
 2015-01-02 01:58:16 +01:00
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
f8e2dd681b Update plugin to 1.0 2014-12-12 14:31:41 +01:00
Dominik Schürmann
e41dcd3795 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
Dominik Schürmann
2d992f19f7 Update safeslinger lib 2014-10-25 02:39:03 +02:00
Dominik Schürmann
1ec10ec894 Update safeslinger lib 2014-10-07 16:39:19 +02:00
Dominik Schürmann
2c22a4c2f6 Update safeslinger lib 2014-10-03 02:28:01 +02:00
Dominik Schürmann
0a546a3555 Update safeslinger lib 2014-09-24 11:34:04 +02:00
Dominik Schürmann
a59584f230 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:10:04 +02:00
Dominik Schürmann
b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann
0335b99516 update keybase lib 2014-09-21 09:28:38 +02:00
Dominik Schürmann
a8f7bd49e3 Update libs 2014-09-15 10:22:47 +02:00
Vincent Breitmoser
2a6774b221 merge: add support for s2k dummy generation 
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
 2014-09-11 22:45:35 +02:00
Dominik Schürmann
c344158c37 Yubikey decryption works now 2014-09-09 08:52:25 +02:00
Dominik Schürmann
eecf4f655b Unify package name 2014-09-08 22:34:43 +02:00
Dominik Schürmann
854679dc35 Update nfc lib 2014-09-08 22:28:21 +02:00
Dominik Schürmann
11b9ed2b74 Update libs 2014-09-08 14:09:28 +02:00
Dominik Schürmann
f4592c8b95 Yubikey: use PIN 2014-09-08 00:40:50 +02:00
Dominik Schürmann
83af19de20 Prepare Yubikey decryption 2014-09-08 00:01:29 +02:00
Dominik Schürmann
bb0d04de82 Fix for user ids in API 2014-09-07 20:09:36 +02:00
Dominik Schürmann
cfe20d89ea Update API lib 2014-09-07 19:23:55 +02:00
Dominik Schürmann
857fc43873 Update and fix Intent API 2014-09-07 18:50:58 +02:00
Dominik Schürmann
a9644cab07 Update Intent API 2014-09-07 18:31:52 +02:00
Dominik Schürmann
e40dc48da3 Update safeslinger lib 2014-09-04 20:54:48 +02:00
Dominik Schürmann
10e96dff43 Add safeslinger to build 2014-09-04 11:30:36 +02:00
Dominik Schürmann
dece50244b Add safeslinger submodule 2014-09-04 11:23:23 +02:00
Dominik Schürmann
40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann
456aa00e2a Update TokenAutoComplete 2014-08-29 18:49:55 +02:00
Dominik Schürmann
aeb0296572 Update nfc lib 2014-08-28 11:05:52 +02:00
Dominik Schürmann
c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2014-08-28 11:00:18 +02:00
Vincent Breitmoser
08bdb0c5b9 update to tidy spongy-master 2014-08-23 11:59:21 +02:00
Dominik Schürmann
aa35f6cffb Fixing build with Spongy Castle 1.51 2014-08-21 15:20:49 +02:00
Dominik Schürmann
602fd546f7 Update spongy castle, not building... 2014-08-21 15:12:25 +02:00
Dominik Schürmann
d26c6b1a08 Update keybase lib 2014-08-20 09:20:30 +02:00
Dominik Schürmann
bc76941bc1 Fix sticky list headers lib, fix travis 2014-08-14 19:30:59 +02:00
Dominik Schürmann
110f8c4d52 Update sticky list headers 2014-08-14 17:00:36 +02:00
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
d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
Dominik Schürmann
9682826193 update api lib 2014-08-12 15:51:29 +02:00
Dominik Schürmann
a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +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