Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -1/+3 | |
|\ | ||||||
| * | fix primary user id in master key flag modification | Vincent Breitmoser | 2014-08-19 | 1 | -1/+3 | |
| | | ||||||
* | | Change criticallity of subpackets after discussion | Dominik Schürmann | 2014-08-19 | 1 | -5/+5 | |
|/ | ||||||
* | Use higher s2k count | Dominik Schürmann | 2014-08-19 | 1 | -10/+29 | |
| | ||||||
* | Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible | Dominik Schürmann | 2014-08-19 | 1 | -20/+22 | |
| | ||||||
* | Mark packets critical | Dominik Schürmann | 2014-08-19 | 1 | -11/+11 | |
| | ||||||
* | add feature to key sig subpacket to indicate that we want MDC | Dominik Schürmann | 2014-08-19 | 1 | -0/+3 | |
| | ||||||
* | New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering | Dominik Schürmann | 2014-08-19 | 1 | -7/+17 | |
| | ||||||
* | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -2/+48 | |
| | ||||||
* | use correct algorithm for signatures (actually fix heterogeneous subkeys) | Vincent Breitmoser | 2014-08-16 | 1 | -4/+4 | |
| | ||||||
* | fix small log format string mistake for adding subkeys | Vincent Breitmoser | 2014-08-16 | 1 | -1/+2 | |
| | | | | closes #768 | |||||
* | Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key | Dominik Schürmann | 2014-08-16 | 1 | -1/+1 | |
| | ||||||
* | tests: more expected error types | Vincent Breitmoser | 2014-08-16 | 1 | -1/+2 | |
| | ||||||
* | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -3/+3 | |
| | ||||||
* | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -181/+298 | |
| | ||||||
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -1/+7 | |
| | ||||||
* | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+12 | |
| | ||||||
* | support changing expiry of subkeys to none | Vincent Breitmoser | 2014-08-14 | 1 | -1/+2 | |
| | ||||||
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -4/+5 | |
| | | | | selection for adding new subkeys | |||||
* | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
| | ||||||
* | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
| | ||||||
* | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 1 | -4/+4 | |
| | ||||||
* | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -15/+81 | |
| | | | | methods | |||||
* | always return an EditKeyResult in modifyKey method | Vincent Breitmoser | 2014-07-31 | 1 | -25/+25 | |
| | ||||||
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+3 | |
| | ||||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 | |
| | ||||||
* | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -9/+18 | |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | |||||
| * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -9/+18 | |
| | | ||||||
* | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 1 | -2/+3 | |
|/ | | | | fixes #721 | |||||
* | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+5 | |
| | ||||||
* | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+1 | |
| | ||||||
* | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 1 | -7/+9 | |
| | ||||||
* | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -44/+56 | |
| | ||||||
* | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 | |
| | ||||||
* | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 1 | -24/+50 | |
| | ||||||
* | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 1 | -15/+15 | |
| | ||||||
* | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 | |
| | ||||||
* | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+10 | |
| | ||||||
* | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 1 | -4/+8 | |
| | ||||||
* | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | ||||||
* | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+6 | |
| | ||||||
* | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -4/+111 | |
| | | | | Closes #695 | |||||
* | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 1 | -37/+59 | |
| | ||||||
* | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -9/+67 | |
| | ||||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -9/+6 | |
| | | | | closes #698 | |||||
* | ditch outdated certifyKey operation | Vincent Breitmoser | 2014-06-22 | 1 | -54/+0 | |
| | ||||||
* | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 1 | -714/+231 | |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -71/+113 | |
| | | ||||||
| * | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -148/+116 | |
| | |