aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
...
* | decryptverify: add trivial detection of pgp ascii-armored dataVincent Breitmoser2015-09-301-2/+33
| |
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-282-6/+11
|\|
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-2/+6
| |
| * Reject filenames with slashes completlyDominik Schürmann2015-09-241-4/+5
| |
* | upload: re-add upload by bytesVincent Breitmoser2015-09-281-19/+18
| |
* | signencrypt: make sure we buffer the InputStreamVincent Breitmoser2015-09-281-4/+5
|/
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-171-0/+1
|
* mime: respect charset header (default to utf-8)Vincent Breitmoser2015-09-161-4/+3
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-151-0/+10
| | | | mime parsing
* strip encrypted filenames to basenames (OKC-01-004)Vincent Breitmoser2015-09-111-0/+3
|
* perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-112-11/+12
|
* complain about mdc insecurity status only if data actually was encryptedVincent Breitmoser2015-09-101-15/+16
|
* add support for signed-only data in the backend (#1507)Vincent Breitmoser2015-09-101-317/+368
|
* Use new HashSet<>(Arrays.asList()) instead of staticDominik Schürmann2015-09-041-38/+36
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-1/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-3/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-1/+1
| | |
| * | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-098-1128/+0
| | |
| * | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-0/+11
| | |
| * | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-253-7/+7
| | |
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-249-455/+600
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-5/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | some linked id ui fine tuningVincent Breitmoser2015-03-264-4/+4
| | | | |
| * | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-245-20/+13
| | | | |
| * | | | work on cookie scanning during creationVincent Breitmoser2015-03-244-138/+117
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-249-86/+150
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
| | | | | |
| * | | | | support github resource (re)Vincent Breitmoser2015-03-241-0/+11
| | | | | |
| * | | | | support github resource (pa)Vincent Breitmoser2015-03-243-46/+220
| | | | | |
| * | | | | work on certification uiVincent Breitmoser2015-03-154-0/+26
| | | | | |
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-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/identifierVincent Breitmoser2015-03-138-70/+25
| | | | | | |
| * | | | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
| | | | | | |
| * | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-123-62/+171
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-088-128/+258
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-063-4/+4
| | | | | | | |
| * | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-055-4/+26
| | | | | | | |
| * | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-058-28/+102
| | | | | | | |
| * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-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 matcherVincent Breitmoser2015-03-051-5/+2
| | | | | | | | |
| * | | | | | | | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
| | | | | | | | |
| * | | | | | | | do a TON of UI workVincent Breitmoser2015-03-058-131/+211
| | | | | | | | |
| * | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-047-196/+190
| | | | | | | | |
| * | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| | | | | | | | |
| * | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0216-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/twitterVincent Breitmoser2015-01-161-0/+4
| | | | | | | | | |
| * | | | | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-161-4/+33
| | | | | | | | | |
| * | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-157-33/+31
| | | | | | | | | |
| * | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-144-52/+79
| | | | | | | | | |
| * | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 00:04:10 +0000