New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering

This commit is contained in:
Dominik Schürmann 2014-08-19 10:30:44 +02:00
parent 6ffdafc0e6
commit a2b3824556

View File

@ -84,15 +84,25 @@ import java.util.Stack;
public class PgpKeyOperation { public class PgpKeyOperation {
private Stack<Progressable> mProgress; private Stack<Progressable> mProgress;
// most preferred is first
private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS = new int[]{ private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS = new int[]{
SymmetricKeyAlgorithmTags.AES_256, SymmetricKeyAlgorithmTags.AES_192, SymmetricKeyAlgorithmTags.AES_256,
SymmetricKeyAlgorithmTags.AES_128, SymmetricKeyAlgorithmTags.CAST5, SymmetricKeyAlgorithmTags.AES_192,
SymmetricKeyAlgorithmTags.TRIPLE_DES}; SymmetricKeyAlgorithmTags.AES_128,
private static final int[] PREFERRED_HASH_ALGORITHMS = new int[]{HashAlgorithmTags.SHA1, SymmetricKeyAlgorithmTags.CAST5
HashAlgorithmTags.SHA256, HashAlgorithmTags.RIPEMD160}; };
private static final int[] PREFERRED_HASH_ALGORITHMS = new int[]{
HashAlgorithmTags.SHA512,
HashAlgorithmTags.SHA384,
HashAlgorithmTags.SHA224,
HashAlgorithmTags.SHA256,
HashAlgorithmTags.RIPEMD160
};
private static final int[] PREFERRED_COMPRESSION_ALGORITHMS = new int[]{ private static final int[] PREFERRED_COMPRESSION_ALGORITHMS = new int[]{
CompressionAlgorithmTags.ZLIB, CompressionAlgorithmTags.BZIP2, CompressionAlgorithmTags.ZLIB,
CompressionAlgorithmTags.ZIP}; CompressionAlgorithmTags.BZIP2,
CompressionAlgorithmTags.ZIP
};
public PgpKeyOperation(Progressable progress) { public PgpKeyOperation(Progressable progress) {
super(); super();