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
Dominik Schürmann
ae7ba2639f
Support verification of detached signatures
2015-01-27 13:00:28 +01:00
Dominik Schürmann
e8780b4410
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Vincent Breitmoser
6c80025ead
backend support for charset in ascii-armored streams
2015-01-27 09:17:23 +01:00
Dominik Schürmann
fc786280fd
Fixes for detached signatures
2015-01-26 17:33:40 +01:00
Dominik Schürmann
34a7728cec
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Vincent Breitmoser
8d9c3c0534
lift language level to java 7, and some code cleanup
2015-01-25 12:36:00 +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
a65edcdb2f
only respect most recent signature for key flags
2015-01-19 18:31:57 +01:00
Vincent Breitmoser
73feaa974c
small fixes to user attribute handling
2015-01-14 13:25:38 +01:00
Vincent Breitmoser
4660608887
fix log entry for addition of user attributes
2015-01-14 13:25:38 +01:00
Vincent Breitmoser
c57355b24a
actually import user attributes (though they are not shown anywhere yet)
2015-01-14 00:03:02 +01:00
Vincent Breitmoser
abd1211613
hack to make WrappedUserAttribute serializable
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
2015-01-13 20:42:40 +01:00
Vincent Breitmoser
84eece622b
support addition of user attributes
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/res/values/strings.xml
2015-01-13 20:41:01 +01:00
Vincent Breitmoser
50e515c6cd
add support for user attributes in merge() routine
2015-01-13 20:37:26 +01:00
Vincent Breitmoser
fc85ef71a8
remove LinkedIdentity (committed earlier by accident)
2015-01-13 00:10:59 +01:00
Vincent Breitmoser
fc3397de5d
add support for user attributes (during canonicalization)
2015-01-12 20:08:35 +01:00
Dominik Schürmann
a87a45aa9a
No output stream for detached signatures, makes no sense to pipe it through
2015-01-08 14:57:09 +01:00
Dominik Schürmann
1c4b8c193d
Experimental API support for detached signatures (not tested)
2015-01-08 14:48:13 +01:00
Dominik Schürmann
6ec85b0550
Clearup after lockpattern experiments
2015-01-06 19:29:51 +01:00
Dominik Schürmann
af762a65a0
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-06 14:52:12 +01:00
Dominik Schürmann
e34ad18ed2
Passphrase wizard tests
2015-01-06 14:52:07 +01:00
Vincent Breitmoser
47ace7cea3
make certify routines more robust ( #1016 )
2015-01-03 22:14:12 +01:00
Vincent Breitmoser
2192a6badd
add more descriptive string about non-mdc encrypted data
2015-01-03 21:07:33 +01:00
Vincent Breitmoser
320f7d35ef
encapsulate high level edit key into new operation class
2015-01-03 13:55:15 +01:00
Vincent Breitmoser
5057ea1744
deal with non-existent user ids during import ( #994 )
2015-01-02 14:28:03 +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
7223abcf0c
extend canonicalize to strip local certificates on export
2015-01-02 00:07:05 +01:00
Vincent Breitmoser
1c1ae769ef
small improvements regarding pin tests and logging
2015-01-01 21:13:07 +01:00
Vincent Breitmoser
2d38079574
add empty notation data packet only if necessary
2015-01-01 20:46:39 +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
Vincent Breitmoser
9e663237b6
Merge branch 'development' of github.com:open-keychain/open-keychain into development
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
2014-12-30 13:09:27 +01:00
Vincent Breitmoser
2223cdd405
some small notation data fixes
2014-12-30 13:07:56 +01:00
Vincent Breitmoser
438405d3d2
add PIN as a SecretKeyType
2014-12-30 12:34:24 +01:00
Vincent Breitmoser
c7b0b650c1
introduce handling of notation direct key signatures, and experimental pin notation packet
2014-12-30 00:44:12 +01:00
Dominik Schürmann
ccde6add70
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2014-12-29 23:17:01 +01:00
Dominik Schürmann
610c4780f1
New work on PIN and lock pattern UI
2014-12-29 23:16:54 +01:00
Vincent Breitmoser
576e6fd0cc
introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities
2014-12-29 23:12:11 +01:00
Dominik Schürmann
a86abe04cd
Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys
2014-12-28 20:57:03 +01:00
Dominik Schürmann
fc32f5f9d4
Minor code cleanup
2014-11-21 12:41:39 +01:00
Vincent Breitmoser
082722a3cf
prevent cancel dring consolidate, move logic into progressable
2014-10-26 22:00:57 +01:00
Vincent Breitmoser
510ef40f55
implement upload of keyring after certification, check that option by default
2014-10-26 01:50:48 +02:00
Dominik Schürmann
94693efbe5
Fail on unknown key ids on API, Key item design consistency for API
2014-10-26 00:19:14 +02:00
Vincent Breitmoser
b9c0504465
remove unnecessary (and buggy) BufferedInputStream wrapping
2014-10-25 22:20:55 +02:00
Vincent Breitmoser
748049fb5b
slightly change wording in merge logs
2014-10-25 02:50:48 +02:00
Vincent Breitmoser
30d0afa363
change the way merging is logged
2014-10-25 02:45:16 +02:00
