Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 2 | -13/+25 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 7 | -104/+223 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 4 | -11/+25 |
| | | |||||
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -1/+3 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2014-08-11 | 2 | -7/+7 |
| | | |||||
| * | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 1 | -2/+27 |
| | | |||||
| * | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -6/+6 |
| | | |||||
| * | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -2/+21 |
| | | |||||
| * | Add option to pass original filename to PgpSignEncrypt | Dominik Schürmann | 2014-08-11 | 1 | -12/+20 |
| | | |||||
| * | progress for signing binary | Dominik Schürmann | 2014-08-11 | 1 | -15/+27 |
| | | |||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-11 | 1 | -18/+11 |
| | | |||||
| * | Handle missing MDC as failed only if no valid signature is present | Dominik Schürmann | 2014-08-10 | 2 | -1/+9 |
| | | |||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-10 | 1 | -6/+4 |
| | | |||||
| * | Handle missing integrity protection MDC packet as if integrity check would ↵ | Dominik Schürmann | 2014-08-10 | 1 | -4/+5 |
| | | | | | | | | | | | | have failed. An attacker could strip the MDC on its way to the receiver... | ||||
| * | Introduction of metadata api, starting to fix decryption progress | Dominik Schürmann | 2014-08-10 | 3 | -44/+84 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 15 | -126/+208 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -2/+3 |
| | | |||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 2 | -4/+1 |
| | | |||||
| * | 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 | 2 | -17/+14 |
| | | | | | | | | selection for adding new subkeys | ||||
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 11 | -0/+187 |
| | | |||||
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -2/+2 |
| | | |||||
| * | delete unused PgpConversionHelper | Vincent Breitmoser | 2014-08-04 | 1 | -102/+0 |
| | | |||||
| * | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 3 | -9/+27 |
|\| | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 2 | -6/+2 |
| |\ | |||||
| | * | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 |
| | | | |||||
| * | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -3/+25 |
| |/ | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 12 | -279/+406 |
|\| | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
| * | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 2 | -21/+22 |
| | | |||||
| * | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -15/+81 |
| | | | | | | | | methods | ||||
| * | fix fromStream method, properly recognize multiple concatenated streams | Vincent Breitmoser | 2014-07-31 | 1 | -17/+20 |
| | | |||||
| * | always return an EditKeyResult in modifyKey method | Vincent Breitmoser | 2014-07-31 | 1 | -25/+25 |
| | | |||||
| * | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 1 | -26/+65 |
| | | |||||
| * | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+3 |
| | | |||||
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 12 | -111/+98 |
| | | |||||
| * | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -5/+5 |
| | | |||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 2 | -20/+29 |
| |\ | | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -11/+11 |
| | | | |||||
| * | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 3 | -10/+19 |
| |/ | | | | | | | fixes #721 | ||||
| * | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 |
| | | |||||
| * | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
| | | |||||
| * | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
| | | |||||
| * | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 |
| | | |||||
| * | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+5 |
| | | |||||
* | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 2 | -120/+14 |
| | | |||||
* | | Reuse signature creation timestamp for synchronous signing | Dominik Schürmann | 2014-07-22 | 2 | -28/+36 |
| | | |||||
* | | Fix test | Dominik Schürmann | 2014-07-21 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 3 | -5/+7 |
|\| |