Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-21 | 1 | -2/+2 | |
|\ | ||||||
| * | SHA1 and RIPEMD160 are not declared insecure until widely deployed | Dominik Schürmann | 2015-10-21 | 1 | -2/+2 | |
| | | ||||||
* | | fix crash due to malformed log entry | Vincent Breitmoser | 2015-10-21 | 1 | -1/+1 | |
|/ | ||||||
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 3 | -22/+85 | |
| | ||||||
* | Mime type consistency | Dominik Schürmann | 2015-10-15 | 1 | -3/+3 | |
| | ||||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 1 | -2/+2 | |
|\ | ||||||
| * | fix variable name mistake (wth did I commit there?!) | Vincent Breitmoser | 2015-10-09 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 9 | -439/+428 | |
|\| | ||||||
| * | pgpdecryptverify: only use keys for verification which are allowed to sign ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -2/+10 | |
| | | | | | | | | (OKC-01-013) | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-10-08 | 1 | -1/+3 | |
| |\ | ||||||
| | * | Constant for max number of canonicalized user ids | Dominik Schürmann | 2015-10-08 | 1 | -1/+3 | |
| | | | ||||||
| * | | improve tests, get rid of some redundant checks | Vincent Breitmoser | 2015-10-08 | 1 | -10/+0 | |
| | | | ||||||
| * | | pgpdecryptverify: get rid of duplicate code path for binary signature ↵ | Vincent Breitmoser | 2015-10-08 | 2 | -106/+2 | |
| | | | | | | | | | | | | verification | |||||
| * | | pgpdecryptverify: fix non-onepass signature checking | Vincent Breitmoser | 2015-10-08 | 2 | -1/+3 | |
| | | | ||||||
| * | | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 1 | -3/+1 | |
| | | | ||||||
| * | | pgpdecryptverify: externalize PgpSignatureChecker | Vincent Breitmoser | 2015-10-08 | 2 | -297/+369 | |
| | | | ||||||
| * | | pgpdecryptverify: move cleartext verification into SignatureChecker | Vincent Breitmoser | 2015-10-08 | 1 | -156/+139 | |
| | | | ||||||
| * | | pgpdecryptverify: refactor signature verification state into ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -134/+141 | |
| | | | | | | | | | | | | SignatureChecker subclass | |||||
| * | | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 1 | -4/+29 | |
| | | | ||||||
| * | | pgpdecryptverify: refactor signature processing | Vincent Breitmoser | 2015-10-06 | 3 | -79/+82 | |
| |/ | ||||||
| * | use only primary and mutually bound subkeys for fingerprint verification | Vincent Breitmoser | 2015-10-06 | 1 | -1/+6 | |
| | | ||||||
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 1 | -2/+2 | |
| | | ||||||
| * | No show key button for RESULT_INVALID_SIGNATURE, Cleanup | Dominik Schürmann | 2015-09-30 | 1 | -1/+1 | |
| | | ||||||
| * | Fix crashes with Fluffys PGP applet | Dominik Schürmann | 2015-09-30 | 1 | -1/+1 | |
| | | ||||||
* | | decryptverify: add trivial detection of pgp ascii-armored data | Vincent Breitmoser | 2015-09-30 | 1 | -2/+33 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 2 | -6/+11 | |
|\| | ||||||
| * | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 1 | -2/+6 | |
| | | ||||||
| * | Reject filenames with slashes completly | Dominik Schürmann | 2015-09-24 | 1 | -4/+5 | |
| | | ||||||
* | | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 1 | -19/+18 | |
| | | ||||||
* | | signencrypt: make sure we buffer the InputStream | Vincent Breitmoser | 2015-09-28 | 1 | -4/+5 | |
|/ | ||||||
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 | |
| | ||||||
* | mime: respect charset header (default to utf-8) | Vincent Breitmoser | 2015-09-16 | 1 | -4/+3 | |
| | ||||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 1 | -0/+10 | |
| | | | | mime parsing | |||||
* | strip encrypted filenames to basenames (OKC-01-004) | Vincent Breitmoser | 2015-09-11 | 1 | -0/+3 | |
| | ||||||
* | perform fingerprint check after canonicalization (OKC-01-009) | Vincent Breitmoser | 2015-09-11 | 2 | -11/+12 | |
| | ||||||
* | complain about mdc insecurity status only if data actually was encrypted | Vincent Breitmoser | 2015-09-10 | 1 | -15/+16 | |
| | ||||||
* | add support for signed-only data in the backend (#1507) | Vincent Breitmoser | 2015-09-10 | 1 | -317/+368 | |
| | ||||||
* | Use new HashSet<>(Arrays.asList()) instead of static | Dominik Schürmann | 2015-09-04 | 1 | -38/+36 | |
| | ||||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 2 | -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-identities | Vincent Breitmoser | 2015-05-11 | 2 | -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 UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 8 | -1128/+0 | |
| | | | ||||||
| * | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 1 | -0/+11 | |
| | | | ||||||
| * | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 3 | -7/+7 | |
| | | | ||||||
| * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 9 | -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-identities | Vincent Breitmoser | 2015-04-09 | 1 | -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 tuning | Vincent Breitmoser | 2015-03-26 | 4 | -4/+4 | |
| | | | | | ||||||
| * | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 5 | -20/+13 | |
| | | | | | ||||||
| * | | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 4 | -138/+117 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 9 | -86/+150 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java |