Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 8 | -128/+258 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -4/+68 |
| | | |||||
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
| * | | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 3 | -9/+11 |
| | | | |||||
| * | | Cleanup of PgpConstants | Dominik Schürmann | 2015-03-05 | 1 | -24/+22 |
| | | | |||||
| * | | Add missing header | Dominik Schürmann | 2015-03-05 | 1 | -0/+17 |
| | | | |||||
| * | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+30 |
| | | | |||||
| * | | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 4 | -33/+51 |
| | | | |||||
| * | | Add missing file with PGP Constants | Dominik Schürmann | 2015-03-05 | 1 | -0/+69 |
| | | | |||||
| * | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 5 | -129/+39 |
| | | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
| * | | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 5 | -20/+40 |
| | | | |||||
* | | | prepare superclass extraction for final linked id creation fragment | Vincent Breitmoser | 2015-03-06 | 3 | -4/+4 |
| | | | |||||
* | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 5 | -4/+26 |
| | | | |||||
* | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 8 | -28/+102 |
| | | | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -9/+10 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
| |/ | |||||
* | | small fixes to the matcher | Vincent Breitmoser | 2015-03-05 | 1 | -5/+2 |
| | | |||||
* | | fixed length identifiers | Vincent Breitmoser | 2015-03-05 | 2 | -7/+4 |
| | | |||||
* | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 8 | -131/+211 |
| | | |||||
* | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 7 | -196/+190 |
| | | |||||
* | | nonce is 4 bytes | Vincent Breitmoser | 2015-03-02 | 1 | -9/+9 |
| | | |||||
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 16 | -479/+1202 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -1/+163 |
| |\ | |||||
| | * | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| | | | |||||
| | * | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 2 | -8/+11 |
| | | | |||||
| | * | Use master key id for keybase proof verification | Dominik Schürmann | 2014-11-22 | 1 | -10/+4 |
| | | | |||||
| | * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -1/+161 |
| | | | | |||||
| * | | | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 2 | -4/+25 |
| | | | | |||||
| * | | | ignore revoked user ids for primary key expiry | Vincent Breitmoser | 2015-02-26 | 5 | -23/+82 |
| | | | | |||||
| * | | | fix comments and some warnings in PgpDecryptVerify | Vincent Breitmoser | 2015-02-17 | 1 | -9/+4 |
| | | | | |||||
| * | | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -7/+5 |
| | | | | |||||
| * | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 7 | -294/+458 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 1 | -92/+213 |
| | | | | |||||
| * | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 2 | -3/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| | * | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 2 | -3/+33 |
| | | | | | |||||
| * | | | | Fixes for detached signatures | Dominik Schürmann | 2015-01-26 | 1 | -9/+26 |
| | | | | | |||||
| * | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 11 | -77/+582 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 9 | -39/+23 |
| | | | | | |||||
| | * | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+11 |
| | | | | | |||||
| | * | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 2 | -9/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| | * | | | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 2 | -25/+22 |
| | | | | | |||||
| | * | | | only respect most recent signature for key flags | Vincent Breitmoser | 2015-01-19 | 2 | -12/+42 |
| | | | | | |||||
| | * | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 2 | -3/+26 |
| | | | | | |||||
| | * | | | fix log entry for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 4 | -4/+52 |
| | | | | | |||||
| | * | | | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -0/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java | ||||
| | * | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -3/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 |
| | | | | |