connectbot-yubikey/open-keychain - open-keychain with patches to support ssh authentication

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Cleanup	Dominik Schürmann	2014-07-22	1	-12/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Reuse signature creation timestamp for synchronous signing	Dominik Schürmann	2014-07-22	3	-33/+44
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix test	Dominik Schürmann	2014-07-21	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into yubikey	Dominik Schürmann	2014-07-21	4	-5/+9
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	canonicalize: fix for tests	Vincent Breitmoser	2014-07-19	4	-5/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	NFC Yubikey: only pass through hash of message and not whole content	Dominik Schürmann	2014-07-21	5	-53/+119
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into yubikey	Dominik Schürmann	2014-07-18	4	-1/+34
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Daniel Albert	2014-07-16	36	-906/+728
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
\| * \| \| \| \| \| \|	Final Commit for #662	Daniel Albert	2014-07-16	1	-1/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into feature-conceal-software	Daniel Albert	2014-07-13	3	-8/+223
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added Preference for concealing the PgpApplication	Daniel Albert	2014-07-12	3	-0/+28
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fixes	Dominik Schürmann	2014-07-17	6	-24/+132
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Temporary program flow fixes	Dominik Schürmann	2014-07-16	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Simple create key	Dominik Schürmann	2014-07-16	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Simple create key	Dominik Schürmann	2014-07-16	2	-46/+57
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	New first time screen	Dominik Schürmann	2014-07-16	6	-474/+241
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fallback if no primary user id exists	Dominik Schürmann	2014-07-16	11	-13/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)	Vincent Breitmoser	2014-07-15	9	-22/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	signatures: a revocation reason does NOT determine if a cert is a revocation ↵	Vincent Breitmoser	2014-07-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	type
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-15	3	-3/+8
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	merge: different msg if nothing was merged	Vincent Breitmoser	2014-07-15	3	-3/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	some fixes for edit	Dominik Schürmann	2014-07-15	2	-4/+5
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into external-test	Vincent Breitmoser	2014-07-15	5	-23/+373
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-12	3	-16/+151
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Fixed misplaced bracket	Daniel Albert	2014-07-12	1	-1/+1
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Fixed issues discussed in #713	Daniel Albert	2014-07-12	2	-12/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Put text into strings.xml, for internationalization	Daniel Albert	2014-07-12	1	-6/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added Purging for Android < 4.1	Daniel Albert	2014-07-12	1	-28/+51
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Implemented Notification, no fallback yet	Daniel Albert	2014-07-12	3	-7/+83
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	new PassphraseCache, storing UserIDs as well	Daniel Albert	2014-07-12	1	-11/+47
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	more work on edit key	Dominik Schürmann	2014-07-12	2	-7/+222
\| \|/ / / / / /
* \| \| \| \| \| \|	modifyKey: error out on integrity check fails	Vincent Breitmoser	2014-07-12	2	-10/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	createKey: better logging, handle empty user id case	Vincent Breitmoser	2014-07-12	2	-44/+61
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into external-test	Vincent Breitmoser	2014-07-11	6	-62/+262
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
\| * \| \| \| \| \|	Fix OperationResultParcel	mar-v-in	2014-07-09	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Naming conventions save lives... or atleast make addAll() work
\| * \| \| \| \| \|	Fix nullpointer in API, fix #693	Dominik Schürmann	2014-07-08	1	-1/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-08	2	-6/+27
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Work on subkeys adapter	Dominik Schürmann	2014-07-08	4	-52/+246
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	modifyKey: proper expiry check during SubkeyAdd	Vincent Breitmoser	2014-07-11	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	modifyKey: make SubkeyChange operations work	Vincent Breitmoser	2014-07-11	4	-27/+64
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	SaveKeyringParcel: follow attribute m prefix coding guideline	Vincent Breitmoser	2014-07-11	8	-69/+66
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	test: get rid of some SaveKeyringParcel boilerplate	Vincent Breitmoser	2014-07-11	1	-5/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	get rid of some inspection warnings	Vincent Breitmoser	2014-07-11	2	-4/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	modifyKey: error out on nonexisting new primary user id	Vincent Breitmoser	2014-07-11	2	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix bug in canonicalization regarding subkey revocation	Vincent Breitmoser	2014-07-11	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	modifyKey: couple more fixes from tests	Vincent Breitmoser	2014-07-11	2	-4/+34
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	some UncachedKeyRing fixes, primary user id mostly	Vincent Breitmoser	2014-07-11	3	-18/+67
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	modifyKey: preserve master key flags	Vincent Breitmoser	2014-07-11	1	-5/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	add come createKey strings	Vincent Breitmoser	2014-07-11	2	-2/+11
\| \| \| \| \| \| \|