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

	Commit message (Collapse)	Author	Age	Files	Lines
*	move stray test file to correct position	Vincent Breitmoser	2015-08-29	1	-0/+46
\|
*	Merge branch 'linked-identities' (and fix OperationHelper ids)	Vincent Breitmoser	2015-08-29	2	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
* \|	Remove dead code	Dominik Schürmann	2015-08-27	1	-17/+17
\| \|
* \|	Disable new failing test for now	Dominik Schürmann	2015-08-10	1	-2/+3
\| \|
* \|	Fix test cases, add test cases (still 1 failing)	Dominik Schürmann	2015-08-10	4	-40/+166
\| \|
* \|	Introduce constants in OpenPgpSignature and DecryptionResult for ↵	Dominik Schürmann	2015-08-09	1	-7/+7
\| \| \| \| \| \| \| \|	unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* \|	made mSignatureTime optional in CryptoOperationHelper	Adithya Abraham Philip	2015-07-15	4	-20/+32
\| \|
* \|	Tests not working anymore on travis after using new annotation parameter	Dominik Schürmann	2015-07-09	14	-57/+84
\| \| \| \| \| \| \| \| \| \| \| \|	Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e.
* \|	Get rid of robolectric workaround by using new annotation in robolectric 3.0	Dominik Schürmann	2015-07-09	14	-84/+57
\| \|
* \|	better handling of divert-to-card keys for subkey modifications	Vincent Breitmoser	2015-07-08	2	-8/+31
\| \|
* \|	tests: make sure encryption happens to all enc-capable subkeys	Vincent Breitmoser	2015-07-07	2	-11/+120
\| \|
* \|	fix PromoteKeyOperationTest	Vincent Breitmoser	2015-07-06	1	-11/+10
\| \|
* \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Adithya Abraham Philip	2015-06-30	1	-4/+3
\|\ \
\| * \|	Create key wizard for blank YubiKey	Dominik Schürmann	2015-06-29	1	-4/+3
\| \| \|
* \| \|	split import and export ops	Adithya Abraham Philip	2015-06-27	1	-2/+1
\|/ /
* \|	Merge branch 'master' into v/multi-decrypt	Vincent Breitmoser	2015-06-26	1	-0/+2
\|\ \
\| * \|	Import R and BuildConfig explicitly	Thialfihar	2015-06-26	1	-0/+2
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into v/eventbus	Vincent Breitmoser	2015-06-11	126	-0/+5961
\| \|\ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'origin/master' into v/multi-decrypt	Vincent Breitmoser	2015-06-11	126	-0/+5973
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Add missing WorkaroundBuildConfig	Dominik Schürmann	2015-06-11	1	-0/+14
\| \|
\| *	Fix debug/release build separation	Dominik Schürmann	2015-06-11	13	-13/+26
\| \|
\| *	Use new officially supported way for local unit tests, many dependencies ↵	Dominik Schürmann	2015-06-11	125	-0/+5934
\|/ \| \| \|	upgraded for this, temporary disabled separate debug builds
*	put unit tests into external module (CAVEAT)	Vincent Breitmoser	2014-07-09	7	-225/+0
\| \| \| \| \| \| \|	this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling.
*	use KeyringTestHelper.diffKeyrings method for unit test	Vincent Breitmoser	2014-07-07	1	-1/+18
\|
*	actually canonicalize	Art O Cathain	2014-07-06	1	-4/+1
\|
*	work in progress	Art O Cathain	2014-07-06	1	-0/+37
\|
*	add create key capabilities to SaveKeyringParcel	Vincent Breitmoser	2014-06-29	1	-1/+0
\|
*	borrow tests from Haskell OpenPGP	Art O Cathain	2014-06-23	1	-1/+67
\|
*	add OpenPGP-Haskell to test collateral	Art O Cathain	2014-06-23	1	-0/+0
\|
*	VERY basic test for save keyring	Art O Cathain	2014-06-21	2	-1/+21
\|
*	Start on Robolectric integration test	Art O Cathain	2014-06-16	4	-0/+89
\|
*	update unit test support in build files	Vincent Breitmoser	2014-05-27	2	-69/+0
\|
*	Rename folder structure from OpenPGP Keychain to OpenKeychain	Dominik Schürmann	2014-04-06	2	-0/+69