aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-259-39/+23
|
* introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+11
|
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-252-9/+84
| | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
* allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-241-1/+1
|
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-242-25/+22
|
* only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
|
* small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
|
* fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
|
* actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-144-4/+52
|
* hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
* support addition of user attributesVincent Breitmoser2015-01-131-3/+49
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml
* add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
|
* remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
|
* add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-123-0/+335
|
* Clearup after lockpattern experimentsDominik Schürmann2015-01-061-6/+1
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-068-74/+258
|\ | | | | | | development
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+6
| |
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-1/+1
| |
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-40/+39
| |
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-2/+4
| |
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-25/+17
| |
| * fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
| | | | | | | | closes #1012
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-8/+45
| |
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-0/+5
| |
| * add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| |
| * tests: add multi key encryption/decryption test, new way for fake passphrase ↵Vincent Breitmoser2015-01-012-2/+2
| | | | | | | | cache
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-301-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| | |
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-304-5/+27
| | |
| * | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-303-14/+112
| | | | | | | | | | | | notation packet
* | | Passphrase wizard testsDominik Schürmann2015-01-061-0/+1
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-291-53/+87
|\| | | | | | | development
| * introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-291-53/+87
| | | | | | | | capabilities
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-1/+6
|/
* Allow for creation date to be in the future up to one day to account for ↵Dominik Schürmann2014-12-281-4/+9
| | | | diverging clocks on different systems for fresh keys
* Minor code cleanupDominik Schürmann2014-11-211-1/+1
|
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-0/+2
|
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-0/+4
|
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-261-0/+14
|
* remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-4/+0
|
* slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
|
* change the way merging is loggedVincent Breitmoser2014-10-251-2/+2
|
* Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-161-5/+11
|
* some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-151-1/+0
|
* make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-132-56/+25
|
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-121-6/+15
|
* move around package structure a bitVincent Breitmoser2014-10-107-491/+12
|
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-103-52/+77
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-097-24/+63
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-097-24/+63
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 02:53:41 +0000