aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-0112-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 progressVincent Breitmoser2014-07-312-21/+22
| |
| * completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-311-15/+81
| | | | | | | | methods
| * fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
| |
| * always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
| |
| * reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-26/+65
| |
| * couple of logging fixesVincent Breitmoser2014-07-311-2/+3
| |
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3112-111/+98
| |
| * Better exception handling for import of keysDominik Schürmann2014-07-311-5/+5
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-292-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 Breitmoser2014-07-271-9/+18
| | |
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-11/+11
| | |
| * | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| |/ | | | | | | fixes #721
| * canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| |
| * generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| |
| * UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| |
| * fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
| |
| * test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+5
| |
* | Remove support for V3 signaturesDominik Schürmann2014-07-222-120/+14
| |
* | Reuse signature creation timestamp for synchronous signingDominik Schürmann2014-07-222-28/+36
| |
* | Fix testDominik Schürmann2014-07-211-2/+1
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-07-213-5/+7
|\|
| * canonicalize: fix for testsVincent Breitmoser2014-07-193-5/+7
| |
* | NFC Yubikey: only pass through hash of message and not whole contentDominik Schürmann2014-07-214-50/+112
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-07-181-1/+6
|\|
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1610-130/+318
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * | Final Commit for #662Daniel Albert2014-07-161-1/+6
| | |
* | | FixesDominik Schürmann2014-07-173-19/+81
| |/ |/|
* | Fallback if no primary user id existsDominik Schürmann2014-07-165-6/+23
| |
* | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-155-15/+15
| |
* | signatures: a revocation reason does NOT determine if a cert is a revocation ↵Vincent Breitmoser2014-07-151-1/+1
| | | | | | | | type
* | merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-2/+6
| |
* | modifyKey: error out on integrity check failsVincent Breitmoser2014-07-121-7/+9
| |
* | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-44/+56
| |
* | modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
| |
* | modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-113-27/+63
| |
* | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-15/+15
| |
* | get rid of some inspection warningsVincent Breitmoser2014-07-111-0/+1
| |
* | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+10
| |
* | fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| |
* | modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| |
* | some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-112-12/+62
| |
* | modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| |
* | add come createKey stringsVincent Breitmoser2014-07-111-1/+6
| |
* | tests: add testSubkeyAddVincent Breitmoser2014-07-101-0/+4
|/
* support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-4/+111
| | | | Closes #695
* fix subkey additionVincent Breitmoser2014-07-021-37/+59
|
* add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-292-35/+67
|
* fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-281-2/+10
|
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-282-61/+52
| | | | closes #698
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 17:06:11 +0000