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

422 Commits

Author SHA1 Message Date
Vincent Breitmoser
1f324be243 do a TON of UI work 2015-03-05 01:58:36 +01:00
Vincent Breitmoser
8222315dbd work more on separation of linked identities and resources, initial ui work 2015-03-04 12:30:56 +01:00
Vincent Breitmoser
e059b5550c nonce is 4 bytes 2015-03-02 20:40:37 +01:00
Vincent Breitmoser
2f83291920 NON-WORKING Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle
 2015-03-02 14:39:28 +01:00
Dominik Schürmann
6dce7c88d8 Merge keybase-proof branch 2015-02-27 01:18:18 +01:00
Vincent Breitmoser
55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00
Vincent Breitmoser
d7888d4666 ignore revoked user ids for primary key expiry 2015-02-26 18:52:54 +01:00
Vincent Breitmoser
bb30cb5401 fix comments and some warnings in PgpDecryptVerify 2015-02-17 18:43:43 +01:00
Vincent Breitmoser
3efaac2175 determine correct filesize during decryption from LiteralData packet 2015-02-17 18:08:45 +01:00
Vincent Breitmoser
7b24ee7b55 rewrite PgpSignEncrypt data flow 
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
 2015-02-01 23:14:26 +01:00
Dominik Schürmann
ae7ba2639f Support verification of detached signatures 2015-01-27 13:00:28 +01:00
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
6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Dominik Schürmann
fc786280fd Fixes for detached signatures 2015-01-26 17:33:40 +01:00
Dominik Schürmann
34a7728cec Merge branch 'development' into detached-sigs-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2015-01-26 16:30:21 +01:00
Vincent Breitmoser
8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser
41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +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
fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser
a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser
6c153b1543 linked id ui work dns/twitter 2015-01-16 15:59:26 +01:00
Vincent Breitmoser
b6a1463161 dns resource is parametrized by fqdn, class and type 2015-01-16 13:57:18 +01:00
Vincent Breitmoser
92b8d874ed affirmation -> linked identity 2015-01-15 16:59:11 +01:00
Vincent Breitmoser
c03bcc2799 work on dns resource, working (dummy) verification 2015-01-14 18:32:50 +01:00
Vincent Breitmoser
73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
2d5abc7da9 small fixes to user attribute handling 2015-01-14 13:05:13 +01:00
Vincent Breitmoser
a75394fbd3 fix log entry for addition of user attributes 2015-01-14 11:07:27 +01:00
Vincent Breitmoser
c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser
965003784b actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:00:04 +01:00
Vincent Breitmoser
abd1211613 hack to make WrappedUserAttribute serializable 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
 2015-01-13 20:42:40 +01:00
Vincent Breitmoser
84eece622b support addition of user attributes 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-01-13 20:41:01 +01:00
Vincent Breitmoser
50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Vincent Breitmoser
4b5de13e42 certification of the first linked identity packet! 2015-01-13 20:36:37 +01:00
Vincent Breitmoser
08ea4e1b7e add support for user attributes in merge() routine 2015-01-13 20:35:27 +01:00
Vincent Breitmoser
189c321528 hack to make WrappedUserAttribute serializable 2015-01-13 20:34:19 +01:00
Vincent Breitmoser
fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser
e71d620840 some work on twitter resource 2015-01-13 00:09:48 +01:00
Vincent Breitmoser
d51621538a forgot to commit WrappedUserAttribute 2015-01-12 21:04:34 +01:00
Vincent Breitmoser
ea72b29f2d support addition of user attributes 2015-01-12 20:59:37 +01:00
Vincent Breitmoser
fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Vincent Breitmoser
9fe701c866 work on affirmations (begin rename to LinkedIdentity 2015-01-12 20:04:15 +01:00
Vincent Breitmoser
8408113322 add support for user attributes (during canonicalization) 2015-01-12 20:03:03 +01:00
Vincent Breitmoser
e0847cafaf even more intermediate result 2015-01-12 19:27:46 +01:00
Vincent Breitmoser
5faeb5f5f0 intermediate state, nothing really working yet 2015-01-12 13:17:18 +01:00
Dominik Schürmann
a87a45aa9a No output stream for detached signatures, makes no sense to pipe it through 2015-01-08 14:57:09 +01:00
Dominik Schürmann
1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00
Dominik Schürmann
6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann
af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00