Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | support github resource (ci) | Vincent Breitmoser | 2015-03-24 | 3 | -3/+70 | |
| | | | | | | ||||||
| * | | | | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 1 | -0/+11 | |
| | | | | | | ||||||
| * | | | | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 3 | -46/+220 | |
| | | | | | | ||||||
| * | | | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 4 | -0/+26 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 4 | -29/+31 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| * | | | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 8 | -70/+25 | |
| | | | | | | | ||||||
| * | | | | | | regenerate twitter token | Vincent Breitmoser | 2015-03-12 | 1 | -4/+16 | |
| | | | | | | | ||||||
| * | | | | | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 3 | -62/+171 | |
| | | | | | | | ||||||
| * | | | | | | 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 | |||||
| * | | | | | | | 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 | |||||
| * | | | | | | | | 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 | |||||
| * | | | | | | | | | linked id ui work dns/twitter | Vincent Breitmoser | 2015-01-16 | 1 | -0/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | dns resource is parametrized by fqdn, class and type | Vincent Breitmoser | 2015-01-16 | 1 | -4/+33 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 7 | -33/+31 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | work on dns resource, working (dummy) verification | Vincent Breitmoser | 2015-01-14 | 4 | -52/+79 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | 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 | -5/+52 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | certification of the first linked identity packet! | Vincent Breitmoser | 2015-01-13 | 3 | -9/+35 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -2/+47 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | some work on twitter resource | Vincent Breitmoser | 2015-01-13 | 1 | -1/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | forgot to commit WrappedUserAttribute | Vincent Breitmoser | 2015-01-12 | 1 | -0/+47 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -3/+49 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | work on affirmations (begin rename to LinkedIdentity | Vincent Breitmoser | 2015-01-12 | 3 | -173/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 3 | -0/+335 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 6 | -77/+290 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 6 | -0/+358 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Remove dead code | Dominik Schürmann | 2015-08-27 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | apply fixPgpMessage to plaintext/armored decrypt input | Vincent Breitmoser | 2015-08-17 | 1 | -18/+14 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Increase s2k iterations back to 0x90 | Dominik Schürmann | 2015-08-10 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Fix test cases, add test cases (still 1 failing) | Dominik Schürmann | 2015-08-10 | 2 | -2/+16 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Dont allow RSA_SIGN, RSA_ENCRYPT, deprecated in RFC | Dominik Schürmann | 2015-08-10 | 1 | -10/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Move TODOs into issue | Dominik Schürmann | 2015-08-10 | 1 | -13/+0 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵ | Dominik Schürmann | 2015-08-10 | 9 | -221/+414 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys | |||||
* | | | | | | | | | | Follow some of coorus recommendations: better selection of algo whitelist, ↵ | Dominik Schürmann | 2015-08-09 | 3 | -38/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore recipients preferred algos | |||||
* | | | | | | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵ | Dominik Schürmann | 2015-08-09 | 7 | -154/+191 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos | |||||
* | | | | | | | | | | added revocation tag NO_REASON to all revocations via PgpKeyOperation | Adithya Abraham Philip | 2015-07-14 | 1 | -0/+7 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 2 | -3/+0 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | allowed operations to modify CryptoInputParcel they receive | Adithya Abraham Philip | 2015-07-13 | 3 | -9/+12 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | fix symmetric passphrase caching (fixes #1401) | Vincent Breitmoser | 2015-07-08 | 1 | -6/+26 | |
| | | | | | | | | | |