Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
|\| | ||||||
| * | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 3 | -5/+7 | |
| | | ||||||
* | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 4 | -50/+112 | |
| | | ||||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-18 | 1 | -1/+6 | |
|\| | ||||||
| * | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 10 | -130/+318 | |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| * | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 | |
| | | | ||||||
* | | | Fixes | Dominik Schürmann | 2014-07-17 | 3 | -19/+81 | |
| |/ |/| | ||||||
* | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 5 | -6/+23 | |
| | | ||||||
* | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 5 | -15/+15 | |
| | | ||||||
* | | signatures: a revocation reason does NOT determine if a cert is a revocation ↵ | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | | | | | | type | |||||
* | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -2/+6 | |
| | | ||||||
* | | 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 | |
| | |