Vincent Breitmoser
40703fe961
Merge branch 'master' into development
...
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
2015-05-28 16:37:15 +02:00
Vincent Breitmoser
5c8af1c5a5
don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes
2015-05-28 16:33:45 +02:00
Vincent Breitmoser
a8e95f676e
don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes
2015-05-28 02:27:44 +02:00
Vincent Breitmoser
46cc7f8174
tests: add attribute to PgpKeyOperationTest
2015-05-20 12:47:23 +02:00
Vincent Breitmoser
158263f255
apply promote operation to specific subkeys present on yubikey only
2015-05-17 01:04:31 +02:00
Vincent Breitmoser
c1e7fcf024
apply promote operation to specific subkeys present on yubikey only
2015-05-17 00:35:10 +02:00
Joey Castillo
2d3f745c36
Removing unused SubkeyChange constructor.
2015-05-13 17:56:18 -04:00
Joey Castillo
0504033c6b
Adding unit tests for PgpKeyOperation keytocard functionality.
2015-05-13 17:56:17 -04:00
William Faulk
971ceb07d4
updated robolectric to support new android support libs
2015-05-03 14:06:01 -07:00
Vincent Breitmoser
ac3efb8b58
fix PgpEncryptDecryptTest for CryptoInputParcel
2015-04-01 01:24:17 +02:00
Dominik Schürmann
adbe5ab63f
Update gradle plugin, update gradle test plugin
2015-03-26 22:56:28 +01:00
Dominik Schürmann
040cf42cb0
Merge branch 'development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
2015-03-24 13:19:43 +01:00
Dominik Schürmann
2204195234
Update build env and plugins
2015-03-23 20:17:30 +01:00
Vincent Breitmoser
5d5e06cabd
fix unit test and add new for divert-to-card promotion
2015-03-22 07:21:27 +01:00
Vincent Breitmoser
88ca41d555
add edit key unit test for no-op
2015-03-20 18:55:16 +01:00
Vincent Breitmoser
3e51da3afa
fix unit tests (for real)
2015-03-20 18:45:00 +01:00
Vincent Breitmoser
e00ce86de9
fix more unit tests (syntax)
2015-03-20 14:57:38 +01:00
Vincent Breitmoser
879efc2c70
fix unit tests (syntax)
2015-03-20 14:21:55 +01:00
Vincent Breitmoser
abce05d529
Merge remote-tracking branch 'origin/development' into development
...
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
2015-03-20 14:01:07 +01:00
Dominik Schürmann
834ce03f9e
Fix header
2015-03-19 03:30:49 +01:00
Dominik Schürmann
e65efce333
Fix tests for Passphrase class
2015-03-19 03:30:12 +01:00
Vincent Breitmoser
aca54e31ea
generalize nfc crypto input structure
2015-03-18 18:25:44 +01:00
Dominik Schürmann
484c3092ee
object oriented split user id
2015-03-16 13:54:12 +01:00
Vincent Breitmoser
db39b779c9
fix expiry of master keys
...
fixes #1141
2015-03-15 19:20:03 +01:00
Dominik Schürmann
0b654bdfe5
Use fixed version of com.squareup:fest-android, enable offline builds
2015-03-15 14:57:37 +01:00
Vincent Breitmoser
4f11fb5a2f
unit test certification of user attributes
2015-03-08 01:46:31 +01:00
Vincent Breitmoser
a70d80483d
add unit test for "no expiry where revoked user id still has expiry" case
2015-02-26 19:06:23 +01:00
Vincent Breitmoser
55dd6526a6
split up and mark unsafe expiry-related methods
2015-02-26 18:53:42 +01:00
Vincent Breitmoser
260ffdf588
add check for filesize to encrypt/decrypt tests
2015-02-17 18:09:07 +01:00
Vincent Breitmoser
d125149bf7
fix tests for new PgpSignEncryptInput
2015-02-02 12:29:37 +01:00
Vincent Breitmoser
7b24ee7b55
rewrite PgpSignEncrypt data flow
...
- 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
2015-02-01 23:14:26 +01:00
Vincent Breitmoser
6c80025ead
backend support for charset in ascii-armored streams
2015-01-27 09:17:23 +01:00
Vincent Breitmoser
41aba69fad
introduce PromoteKeyOperation to create dummy secret from public keys
2015-01-25 02:08:07 +01:00
Vincent Breitmoser
1516f951b7
work on divert-to-key and other keyring stuff
...
- 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
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
fb2fa195bf
allow explicit re-certification in SaveKeyringParcel
2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
Vincent Breitmoser
53955a8014
forgot another test case in prev. commit
2015-01-19 19:15:44 +01:00
Vincent Breitmoser
89969252fd
fix unit test for new key flag behavior
2015-01-19 18:53:12 +01:00
Vincent Breitmoser
2e04888d36
involve user attributes in unit tests for merge and canonicalize!
2015-01-14 13:25:38 +01:00
Vincent Breitmoser
bbc9d90c3e
add basic tests for addition of user attributes
2015-01-14 13:25:38 +01:00
Vincent Breitmoser
0c3f9ae0a6
tests: add a couple of CertifyOperation test cases
2015-01-03 23:02:11 +01:00
Vincent Breitmoser
320f7d35ef
encapsulate high level edit key into new operation class
2015-01-03 13:55:15 +01:00
Vincent Breitmoser
9cf800bcd8
tests: add multiple keys with signature test case
2015-01-02 02:50:14 +01:00
Vincent Breitmoser
56f2a3137b
get rid of RuntimeException control flow in UncachedKeyRing.fromStream
2015-01-02 02:05:12 +01:00
Vincent Breitmoser
b52fb90380
fix and test for bad certificate version numbers ( #1012 )
...
closes #1012
2015-01-02 01:58:16 +01:00
Vincent Breitmoser
704fc2dd45
tests: for export, check that a token local cert actually exists before export
2015-01-02 01:11:43 +01:00
Vincent Breitmoser
57e3266fa5
tests: add test for key export
2015-01-02 00:15:08 +01:00
Vincent Breitmoser
1c1ae769ef
small improvements regarding pin tests and logging
2015-01-01 21:13:07 +01:00
Vincent Breitmoser
9f7b2472cf
tests: be less verbose about inserting keyrings for encrypt/decrypt
2015-01-01 20:21:52 +01:00
Vincent Breitmoser
5e9d8ca8c6
tests: add multi key encryption/decryption test, new way for fake passphrase cache
2015-01-01 20:21:32 +01:00
