diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-10 14:35:15 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-10 14:35:15 +0200 |
| commit | bc18054dc79e3fc1af78bb06730890b276b873ac (patch) | |
| tree | df5c52d628e13b3585acc14ddc767d4a7ddffa95 | |
| parent | 50fa1ac918c85e465f969426e5b4fe0db3987897 (diff) | |
| download | open-keychain-bc18054dc79e3fc1af78bb06730890b276b873ac.tar.gz open-keychain-bc18054dc79e3fc1af78bb06730890b276b873ac.tar.bz2 open-keychain-bc18054dc79e3fc1af78bb06730890b276b873ac.zip | |
Increase s2k iterations back to 0x90
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java index 94fb2d877..3fa549946 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java @@ -249,9 +249,9 @@ public class PgpSecurityConstants { * * Bouncy Castle default: 0x60 * kbsriram proposes: 0xc0 - * Yahoo's End-to-End: 96 (65536 iterations) (https://github.com/yahoo/end-to-end/blob/master/src/javascript/crypto/e2e/openpgp/keyring.js) + * Yahoo's End-to-End: 96=0x60 (65536 iterations) (https://github.com/yahoo/end-to-end/blob/master/src/javascript/crypto/e2e/openpgp/keyring.js) */ - public static final int SECRET_KEY_ENCRYPTOR_S2K_COUNT = 96; + public static final int SECRET_KEY_ENCRYPTOR_S2K_COUNT = 0x90; public static final int SECRET_KEY_ENCRYPTOR_HASH_ALGO = HashAlgorithmTags.SHA512; public static final int SECRET_KEY_ENCRYPTOR_SYMMETRIC_ALGO = SymmetricKeyAlgorithmTags.AES_256; public static final int SECRET_KEY_BINDING_SIGNATURE_HASH_ALGO = HashAlgorithmTags.SHA512; |