Vincent Breitmoser
|
45722d7cfb
|
canonicalize: couple of fixes
|
2014-07-26 22:16:33 +02:00 |
|
Vincent Breitmoser
|
236a502ea7
|
generic UncachedKeyRing fixes
|
2014-07-26 15:51:35 +02:00 |
|
Vincent Breitmoser
|
7296ac4849
|
UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings
|
2014-07-26 03:57:54 +02:00 |
|
Vincent Breitmoser
|
7fe1b00080
|
fixes for extractPublicKeyRing, update SpongyCastle
|
2014-07-26 03:56:28 +02:00 |
|
Vincent Breitmoser
|
ab2b90342e
|
test and fix: adding an empty user id should fail
|
2014-07-26 03:47:29 +02:00 |
|
Vincent Breitmoser
|
cd1511a4e6
|
canonicalize: fix for tests
|
2014-07-19 02:19:15 +02:00 |
|
Daniel Albert
|
d63534d655
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
|
2014-07-16 18:49:16 +02:00 |
|
Daniel Albert
|
e375cde7e1
|
Final Commit for #662
|
2014-07-16 18:17:46 +02:00 |
|
Dominik Schürmann
|
d3c54d5f12
|
Fallback if no primary user id exists
|
2014-07-16 00:22:45 +02:00 |
|
Vincent Breitmoser
|
64b87f75be
|
move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)
|
2014-07-15 19:47:52 +02:00 |
|
Vincent Breitmoser
|
501d4b887a
|
signatures: a revocation reason does NOT determine if a cert is a revocation type
|
2014-07-15 19:31:27 +02:00 |
|
Vincent Breitmoser
|
29145e49c9
|
merge: different msg if nothing was merged
|
2014-07-15 19:17:08 +02:00 |
|
Vincent Breitmoser
|
f82093c666
|
modifyKey: error out on integrity check fails
|
2014-07-12 02:02:37 +02:00 |
|
Vincent Breitmoser
|
0e3327c65c
|
createKey: better logging, handle empty user id case
|
2014-07-12 01:29:06 +02:00 |
|
Vincent Breitmoser
|
20b28b5207
|
modifyKey: proper expiry check during SubkeyAdd
|
2014-07-11 15:42:02 +02:00 |
|
Vincent Breitmoser
|
7b195ac2e3
|
modifyKey: make SubkeyChange operations work
|
2014-07-11 15:20:16 +02:00 |
|
Vincent Breitmoser
|
1436ab8d90
|
SaveKeyringParcel: follow attribute m prefix coding guideline
|
2014-07-11 13:51:36 +02:00 |
|
Vincent Breitmoser
|
26f6d58284
|
get rid of some inspection warnings
|
2014-07-11 13:45:06 +02:00 |
|
Vincent Breitmoser
|
4da273ac16
|
modifyKey: error out on nonexisting new primary user id
|
2014-07-11 13:35:48 +02:00 |
|
Vincent Breitmoser
|
d6f3b4b879
|
fix bug in canonicalization regarding subkey revocation
|
2014-07-11 03:27:44 +02:00 |
|
Vincent Breitmoser
|
f6e39b0a97
|
modifyKey: couple more fixes from tests
|
2014-07-11 02:51:13 +02:00 |
|
Vincent Breitmoser
|
e477577c55
|
some UncachedKeyRing fixes, primary user id mostly
|
2014-07-11 02:50:35 +02:00 |
|
Vincent Breitmoser
|
38ee6203ad
|
modifyKey: preserve master key flags
|
2014-07-11 02:49:51 +02:00 |
|
Vincent Breitmoser
|
dce2df4113
|
add come createKey strings
|
2014-07-11 02:48:54 +02:00 |
|
Vincent Breitmoser
|
90f546a4e8
|
tests: add testSubkeyAdd
|
2014-07-10 01:38:57 +02:00 |
|
Vincent Breitmoser
|
ebcd243e97
|
support changing primary user id in SaveKeyringParcel
Closes #695
|
2014-07-02 16:02:56 +02:00 |
|
Vincent Breitmoser
|
9fb92c8642
|
fix subkey addition
|
2014-07-02 15:03:28 +02:00 |
|
Vincent Breitmoser
|
de698b8955
|
add create key capabilities to SaveKeyringParcel
|
2014-06-29 22:34:53 +02:00 |
|
Vincent Breitmoser
|
3acb7fb087
|
fix nullpointerexception in importkeyactivity
|
2014-06-28 20:54:13 +02:00 |
|
Vincent Breitmoser
|
d6a2875816
|
code cleanup and plurals in import log entries
closes #698
|
2014-06-28 19:15:28 +02:00 |
|
Vincent Breitmoser
|
9f947aefe6
|
ditch outdated certifyKey operation
|
2014-06-22 14:46:14 +02:00 |
|
Art O Cathain
|
0af2b27cb3
|
VERY basic test for save keyring
|
2014-06-21 17:44:04 +01:00 |
|
Dominik Schürmann
|
6b7aa2767a
|
Fix keybase import
|
2014-06-20 15:58:32 +02:00 |
|
Dominik Schürmann
|
48c96184dc
|
Fix app name in PGP header, closing #663
|
2014-06-19 11:56:36 +02:00 |
|
Vincent Breitmoser
|
b40b429bc0
|
remove obsolete subkey binding check from signature verification
|
2014-06-19 00:14:28 +02:00 |
|
Vincent Breitmoser
|
ada6a12174
|
fix key export
|
2014-06-18 21:54:59 +02:00 |
|
Vincent Breitmoser
|
4ad15739e2
|
canonicalize: missed two logging entries
|
2014-06-18 21:43:41 +02:00 |
|
Vincent Breitmoser
|
5f20b8de1a
|
Merge branch 'new-edit'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/res/values/strings.xml
|
2014-06-18 21:09:04 +02:00 |
|
Vincent Breitmoser
|
3bffe4da55
|
generate public keyring from secret if not available
|
2014-06-18 20:55:44 +02:00 |
|
Vincent Breitmoser
|
f8d895dea4
|
consolidate: almost sane logging
|
2014-06-18 20:27:59 +02:00 |
|
Vincent Breitmoser
|
134f8471c0
|
consolidate: add key import routines with consolidation
|
2014-06-18 19:39:16 +02:00 |
|
Vincent Breitmoser
|
f80228a08d
|
consolidate: make it work
|
2014-06-18 14:02:21 +02:00 |
|
Vincent Breitmoser
|
1e45e5cd9a
|
code cleanup in ProviderHelper and UncachedKeyRing
|
2014-06-18 10:00:21 +02:00 |
|
Vincent Breitmoser
|
d8b0015d25
|
consolidate: add logging
|
2014-06-18 00:30:45 +02:00 |
|
Vincent Breitmoser
|
b4974d922e
|
consolidate: first draft
|
2014-06-18 00:30:45 +02:00 |
|
Vincent Breitmoser
|
6e4d0dede1
|
canonicalize: support secret keys
|
2014-06-17 23:25:45 +02:00 |
|
Vincent Breitmoser
|
4bff50bffc
|
new-edit: add logging to modifySecretKeyRing operation
|
2014-06-17 21:23:24 +02:00 |
|
Vincent Breitmoser
|
5c47143d64
|
new-edit: add new save keyring stuff
|
2014-06-17 20:11:54 +02:00 |
|
Vincent Breitmoser
|
a0f546739d
|
new-edit: remove old save keyring stuff
|
2014-06-17 20:03:58 +02:00 |
|
Vincent Breitmoser
|
02fbaaf858
|
import-log: clean up progress messages
|
2014-06-17 12:18:41 +02:00 |
|