diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-02 23:34:00 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-10 09:35:23 +0200 |
| commit | 3d8eda6e3e3748e32e4c47a405cd8c6962e28a96 (patch) | |
| tree | 9bd5ab479d0fc5b38cc3f921c39d98a0500a05e7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | |
| parent | 7c40d89eeaf1d50b00a3c6a901894a1db64c0142 (diff) | |
| download | open-keychain-3d8eda6e3e3748e32e4c47a405cd8c6962e28a96.tar.gz open-keychain-3d8eda6e3e3748e32e4c47a405cd8c6962e28a96.tar.bz2 open-keychain-3d8eda6e3e3748e32e4c47a405cd8c6962e28a96.zip | |
Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java index 8701c27dc..1798baa8e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -62,7 +62,6 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.security.SignatureException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.Set; @@ -228,8 +227,8 @@ public class PgpSignEncryptOperation extends BaseOperation { // Use requested hash algo int requestedAlgorithm = input.getSignatureHashAlgorithm(); - if (requestedAlgorithm == PgpConstants.OpenKeychainHashAlgorithmTags.USE_DEFAULT) { - input.setSignatureHashAlgorithm(PgpConstants.DEFAULT_HASH_ALGORITHM); + if (requestedAlgorithm == PgpSecurityConstants.OpenKeychainHashAlgorithmTags.USE_DEFAULT) { + input.setSignatureHashAlgorithm(PgpSecurityConstants.DEFAULT_HASH_ALGORITHM); } } updateProgress(R.string.progress_preparing_streams, 2, 100); @@ -240,8 +239,8 @@ public class PgpSignEncryptOperation extends BaseOperation { // Use requested encryption algo int algo = input.getSymmetricEncryptionAlgorithm(); - if (algo == PgpConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_DEFAULT) { - algo = PgpConstants.DEFAULT_SYMMETRIC_ALGORITHM; + if (algo == PgpSecurityConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_DEFAULT) { + algo = PgpSecurityConstants.DEFAULT_SYMMETRIC_ALGORITHM; } // has Integrity packet enabled! JcePGPDataEncryptorBuilder encryptorBuilder = @@ -337,8 +336,8 @@ public class PgpSignEncryptOperation extends BaseOperation { // Use preferred compression algo int algo = input.getCompressionAlgorithm(); - if (algo == PgpConstants.OpenKeychainCompressionAlgorithmTags.USE_DEFAULT) { - algo = PgpConstants.DEFAULT_COMPRESSION_ALGORITHM; + if (algo == PgpSecurityConstants.OpenKeychainCompressionAlgorithmTags.USE_DEFAULT) { + algo = PgpSecurityConstants.DEFAULT_COMPRESSION_ALGORITHM; } compressGen = new PGPCompressedDataGenerator(algo); bcpgOut = new BCPGOutputStream(compressGen.open(encryptionOut)); |