aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-281-0/+1
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
| |
* | Support for multiple hash algosDominik Schürmann2014-08-141-11/+21
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-0/+17
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Add license headersDominik Schürmann2014-08-041-0/+17
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-37/+84
|/ | | | | | | | 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 Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-0/+192
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:43:11 +0000