Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix small non-deterministic failure case in unit test | Vincent Breitmoser | 2015-05-31 | 1 | -1/+1 |
| | |||||
* | adapt unit tests to PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -78/+101 |
| | |||||
* | Merge branch 'master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -0/+19 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -4/+25 |
| | | | | | | | | PgpDecryptVerify changes | ||||
| * | tests: add attribute to PgpKeyOperationTest | Vincent Breitmoser | 2015-05-20 | 1 | -0/+19 |
| | | |||||
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -2/+39 |
| | | |||||
* | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -4/+25 |
| | | | | | | | | PgpDecryptVerify changes | ||||
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -2/+39 |
| | | |||||
* | | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 1 | -24/+4 |
| | | |||||
* | | Adding unit tests for PgpKeyOperation keytocard functionality. | Joey Castillo | 2015-05-13 | 1 | -1/+64 |
|/ | |||||
* | fix PgpEncryptDecryptTest for CryptoInputParcel | Vincent Breitmoser | 2015-04-01 | 1 | -26/+22 |
| | |||||
* | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -6/+29 |
| | |||||
* | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+6 |
| | |||||
* | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 2 | -13/+20 |
| | |||||
* | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 4 | -49/+39 |
| | |||||
* | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -18/+20 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 9 | -45/+68 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | Fix header | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| | | |||||
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 9 | -45/+67 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -5/+5 |
|/ | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+53 |
| | |||||
* | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 1 | -0/+6 |
| | | | | fixes #1141 | ||||
* | unit test certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -8/+52 |
| | |||||
* | add unit test for "no expiry where revoked user id still has expiry" case | Vincent Breitmoser | 2015-02-26 | 1 | -2/+14 |
| | |||||
* | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 1 | -20/+20 |
| | |||||
* | add check for filesize to encrypt/decrypt tests | Vincent Breitmoser | 2015-02-17 | 1 | -0/+18 |
| | |||||
* | fix tests for new PgpSignEncryptInput | Vincent Breitmoser | 2015-02-02 | 1 | -29/+29 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -12/+11 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 1 | -0/+54 |
| | |||||
* | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+126 |
| | |||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -2/+51 |
| | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 1 | -1/+2 |
| | |||||
* | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -2/+2 |
| | |||||
* | forgot another test case in prev. commit | Vincent Breitmoser | 2015-01-19 | 1 | -1/+2 |
| | |||||
* | fix unit test for new key flag behavior | Vincent Breitmoser | 2015-01-19 | 1 | -2/+2 |
| | |||||
* | involve user attributes in unit tests for merge and canonicalize! | Vincent Breitmoser | 2015-01-14 | 3 | -15/+73 |
| | |||||
* | add basic tests for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -0/+66 |
| | |||||
* | tests: add a couple of CertifyOperation test cases | Vincent Breitmoser | 2015-01-03 | 1 | -0/+238 |
| | |||||
* | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 6 | -23/+22 |
| | |||||
* | tests: add multiple keys with signature test case | Vincent Breitmoser | 2015-01-02 | 1 | -0/+75 |
| | |||||
* | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 2 | -7/+5 |
| | |||||
* | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -0/+17 |
| | | | | closes #1012 | ||||
* | tests: for export, check that a token local cert actually exists before export | Vincent Breitmoser | 2015-01-02 | 1 | -10/+22 |
| | |||||
* | tests: add test for key export | Vincent Breitmoser | 2015-01-02 | 1 | -0/+211 |
| | |||||
* | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -5/+23 |
| | |||||
* | tests: be less verbose about inserting keyrings for encrypt/decrypt | Vincent Breitmoser | 2015-01-01 | 1 | -2/+15 |
| | |||||
* | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 1 | -43/+123 |
| | | | | cache | ||||
* | fix unit tests (canonicalize after create) | Vincent Breitmoser | 2015-01-01 | 2 | -0/+5 |
| | |||||
* | add test case for PIN unlock | Vincent Breitmoser | 2014-12-30 | 1 | -2/+28 |
| | |||||
* | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 5 | -16/+21 |
| |