diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-02 16:42:07 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-02 16:42:07 +0200 |
| commit | b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d (patch) | |
| tree | d739e18bad160bb12f67d9291e7e69fa4fc0954f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | |
| parent | fe2c17cdeb59ebd65391bf92dc8afb20431ce824 (diff) | |
| download | open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.tar.gz open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.tar.bz2 open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.zip | |
Remove version 3 checks, no longer supported in import
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 6b1433cca..5b78d4a03 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -124,9 +124,9 @@ public class PgpKeyOperation { * * http://kbsriram.com/2013/01/generating-rsa-keys-with-bouncycastle.html */ + private static final int SECRET_KEY_ENCRYPTOR_S2K_COUNT = 0x60; private static final int SECRET_KEY_ENCRYPTOR_HASH_ALGO = HashAlgorithmTags.SHA512; private static final int SECRET_KEY_ENCRYPTOR_SYMMETRIC_ALGO = SymmetricKeyAlgorithmTags.AES_256; - private static final int SECRET_KEY_ENCRYPTOR_S2K_COUNT = 0x60; public PgpKeyOperation(Progressable progress) { super(); @@ -415,8 +415,7 @@ public class PgpKeyOperation { PGPSecretKey masterSecretKey = sKR.getSecretKey(); // Make sure the fingerprint matches - if (saveParcel.mFingerprint == null - || !Arrays.equals(saveParcel.mFingerprint, + if (saveParcel.mFingerprint == null || !Arrays.equals(saveParcel.mFingerprint, masterSecretKey.getPublicKey().getFingerprint())) { log.add(LogLevel.ERROR, LogType.MSG_MF_ERROR_FINGERPRINT, indent); return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null); |