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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into yubikey	Dominik Schürmann	2014-08-01	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
\| *	rename WrappedKey to CanonicalizedKey	Vincent Breitmoser	2014-07-31	1	-5/+5
\| \|
* \|	Remove support for V3 signatures	Dominik Schürmann	2014-07-22	1	-90/+14
\| \|
* \|	Reuse signature creation timestamp for synchronous signing	Dominik Schürmann	2014-07-22	1	-22/+19
\| \|
* \|	NFC Yubikey: only pass through hash of message and not whole content	Dominik Schürmann	2014-07-21	1	-38/+38
\| \|
* \|	Fixes	Dominik Schürmann	2014-07-17	1	-19/+74
\|/
*	use long rather than String to build uris by key	Vincent Breitmoser	2014-05-21	1	-1/+1
\|
*	wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing	Vincent Breitmoser	2014-05-21	1	-5/+5
\|
*	Merge remote-tracking branch 'origin/master' into wrapped-key-ring	Vincent Breitmoser	2014-05-14	1	-2/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
\| *	use setEncryptToSigner for asymmetric encryption	Vincent Breitmoser	2014-05-08	1	-2/+0
\| \| \| \| \| \| \| \|	(tested and works, closes #569)
* \|	wrapped-key-ring: redesign underlying CachedKeyRing	Vincent Breitmoser	2014-05-04	1	-4/+5
\| \|
* \|	wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵	Vincent Breitmoser	2014-05-03	1	-55/+27
\|/ \| \| \|	signencrypt
*	Rename setter methods for PgpSignEncrypt.Builder	Thialfihar	2014-04-29	1	-19/+19
\|
*	Rename ProgressDialogUpdater to Progressable	Thialfihar	2014-04-29	1	-10/+10
\| \| \| \| \|	Also fix some inconsistent usages of "progress", now using "progressable" in all builders.
*	get rid of PgpKeyHelper.getMasterKeyId	Vincent Breitmoser	2014-04-17	1	-2/+5
\| \| \| \|	Closes #575
*	Removing remaining uses of Id, closing one of the oldest bugs #9	Dominik Schürmann	2014-04-14	1	-5/+4
\|
*	Handle new exceptions in KeychainIntentService	Dominik Schürmann	2014-04-13	1	-6/+0
\|
*	More changes to PgpSignEncrypt	Dominik Schürmann	2014-04-12	1	-37/+39
\|
*	PgpSignEncrypt comment	Dominik Schürmann	2014-04-11	1	-0/+2
\|
*	Clarify use of methods in PgpKeyHelper	Dominik Schürmann	2014-04-11	1	-2/+2
\|
*	Remove some Ids...	Dominik Schürmann	2014-04-11	1	-9/+1
\|
*	put signatureType where it belongs	Dominik Schürmann	2014-04-11	1	-8/+8
\|
*	PgpSignEncrypt is now context-free	Dominik Schürmann	2014-04-11	1	-17/+35
\|
*	PgpSignEncrypt: merge generateSignature() into main method	Dominik Schürmann	2014-04-11	1	-127/+79
\|
*	PgpSignEncrypt: get by master key id	Dominik Schürmann	2014-04-11	1	-2/+2
\|
*	Refactor ProviderHelper to be non-static using a constructor based on ↵	Dominik Schürmann	2014-04-11	1	-3/+5
\| \| \| \|	context (first commit to get context out of pgp classes)
*	Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested)	Dominik Schürmann	2014-04-11	1	-24/+45
\|
*	Use NotFoundException in more places	Dominik Schürmann	2014-04-08	1	-3/+11
\|
*	Change license from ASLv2 to GPLv3 where possible	Thialfihar	2014-04-08	1	-9/+10
\|
*	Update copyright timespan for Thialfihar	Thialfihar	2014-04-08	1	-1/+1
\|
*	Rename folder structure from OpenPGP Keychain to OpenKeychain	Dominik Schürmann	2014-04-06	1	-0/+607