aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKeyRing.java
Commit message (Expand)AuthorAgeFilesLines
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-13/+0
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-281-0/+1
|\
| * Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-1/+17
|\|
| * Optimize importsDominik Schürmann2014-08-051-1/+0
| * Add license headersDominik Schürmann2014-08-041-0/+17
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-2/+2
|/
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-0/+152