cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,189 Commits 1 Branch 0 Tags
2bbb9b96085a2758ddef96e9cc8bc24b2a3d3eda
Commit Graph

454 Commits

Author SHA1 Message Date
Vincent Breitmoser
c4d392051c improve robustness of SecretKeyType handling 2015-05-28 22:34:02 +02:00
Vincent Breitmoser
c8f788b925 set to stripped by default, rather than "unavailable" 2015-05-28 22:22:24 +02:00
Vincent Breitmoser
18844a20bb make masterKeyId and subKeyId strictly required in CryptoInputParcel 2015-05-28 19:16:36 +02:00
Vincent Breitmoser
1463bae1b4 fix merge problems (derp) 2015-05-28 17:32:21 +02:00
Vincent Breitmoser
8de0d9e6da create keys with fixed timestamp 2015-05-28 16:34:41 +02:00
Vincent Breitmoser
eb830c6786 warn on signature earlier than key creation, err on significantly earlier 2015-05-28 16:33:45 +02:00
Vincent Breitmoser
5c8af1c5a5 don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 2015-05-28 16:33:45 +02:00
Vincent Breitmoser
f30900d085 add user id flags to UserAttribute self signatures 2015-05-20 12:47:23 +02:00
Vincent Breitmoser
158263f255 apply promote operation to specific subkeys present on yubikey only 2015-05-17 01:04:31 +02:00
Vincent Breitmoser
91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Dominik Schürmann
b726dea244 license header for PgpCertifyOperation 2015-05-04 14:12:42 +02:00
Dominik Schürmann
51bb96742f Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 2015-05-04 14:01:34 +02:00
Dominik Schürmann
1923942fc9 Buffer ascii armored encryption/signatures 2015-04-13 23:41:16 +02:00
Vincent Breitmoser
ad69622b69 fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) 2015-04-01 00:39:32 +02:00
Vincent Breitmoser
8bd8267a47 work on passphrase data flow 2015-03-31 00:28:24 +02:00
Vincent Breitmoser
39b131c7e5 fix Encrypt* with RequiredInputParcel 2015-03-30 23:35:32 +02:00
Vincent Breitmoser
d7b79e55fb pass CryptoInputParcel independently for SignEncryptOperation 2015-03-30 16:40:41 +02:00
Dominik Schürmann
040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
 2015-03-24 13:19:43 +01:00
Vincent Breitmoser
5d5e06cabd fix unit test and add new for divert-to-card promotion 2015-03-22 07:21:27 +01:00
Vincent Breitmoser
2151411219 actually promote to divert, pass yubikey's AID 2015-03-22 03:58:01 +01:00
Vincent Breitmoser
04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Vincent Breitmoser
93c7eb72fb more data in RequiredInputParcel, OperationResult notifications 
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
 2015-03-21 15:16:32 +01:00
Vincent Breitmoser
88ca41d555 add edit key unit test for no-op 2015-03-20 18:55:16 +01:00
Vincent Breitmoser
3e51da3afa fix unit tests (for real) 2015-03-20 18:45:00 +01:00
Vincent Breitmoser
e00ce86de9 fix more unit tests (syntax) 2015-03-20 14:57:38 +01:00
Vincent Breitmoser
3fce6d8a12 inline mNfcSignOps variable 2015-03-20 14:22:07 +01:00
Vincent Breitmoser
879efc2c70 fix unit tests (syntax) 2015-03-20 14:21:55 +01:00
Vincent Breitmoser
6cf966b63f re-inline cryptoInput variable 2015-03-20 14:10:00 +01:00
Vincent Breitmoser
abce05d529 Merge remote-tracking branch 'origin/development' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
 2015-03-20 14:01:07 +01:00
Vincent Breitmoser
3b04636f5d support yubikeys in (some) edit key operations 2015-03-20 02:28:22 +01:00
Kent
1d6643fa6b Fixed #1152: 
- Checking if input.getSignatureSubKeyId() is not null before proceeding.
 2015-03-20 06:40:52 +08:00
Vincent Breitmoser
25d89b5550 generalize NfcOperationParcel to RequiredInputParcel, including passphrases 2015-03-19 14:21:30 +01:00
Dominik Schürmann
9c9f95c7ac New Passphrase class for safer passphrase handling in memory 2015-03-19 03:03:46 +01:00
Vincent Breitmoser
d46fc3740b yubikey certifications! 2015-03-18 21:12:31 +01:00
Vincent Breitmoser
aca54e31ea generalize nfc crypto input structure 2015-03-18 18:25:44 +01:00
Dominik Schürmann
fd8f5ebb2f Allow for hidden recipients in encrypt methods 2015-03-16 18:20:44 +01:00
Dominik Schürmann
a655664c0b object oriented split user id 2015-03-16 13:54:01 +01:00
Vincent Breitmoser
db39b779c9 fix expiry of master keys 
fixes #1141
 2015-03-15 19:20:03 +01:00
Dominik Schürmann
809cd6e495 Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist 2015-03-15 18:58:09 +01:00
Vincent Breitmoser
9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Dominik Schürmann
82a2a76a33 make constant for certify hash algo 2015-03-11 14:37:23 +01:00
Dominik Schürmann
79a4e7fb9c Fix expiry, revoked checks in OpenPgpSignatureResultBuilder 2015-03-10 15:52:44 +01:00
Vincent Breitmoser
30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Dominik Schürmann
23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
 2015-03-05 23:29:43 +01:00
Dominik Schürmann
e50eda4e29 Use ArrayList instead of LinkedList 2015-03-05 17:59:53 +01:00
Dominik Schürmann
02084ba14a Cleanup of PgpConstants 2015-03-05 17:53:14 +01:00
Dominik Schürmann
afbb166de6 Add missing header 2015-03-05 17:52:12 +01:00
Dominik Schürmann
3bc3e3e6f4 Check for insecure hash and symmetric encryption algos on decrypt 2015-03-05 17:46:43 +01:00
Dominik Schürmann
aeb0169f02 Use static linked lists instead of arrays 2015-03-05 17:24:56 +01:00
Dominik Schürmann
0300bce41f Add missing file with PGP Constants 2015-03-05 16:58:15 +01:00