diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 21:58:30 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 21:58:30 +0200 |
| commit | 4e60f1bc75a7727ebc31db4921e5f5f36fe9d184 (patch) | |
| tree | 9d84c0ce38b62b1cdc5b8c639bda649893d850f0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
| parent | 1b98c07237660af0184879425e741b2b06f18132 (diff) | |
| parent | 10fed404ae000a9cd6f8d357e85202f4c884f54e (diff) | |
| download | open-keychain-4e60f1bc75a7727ebc31db4921e5f5f36fe9d184.tar.gz open-keychain-4e60f1bc75a7727ebc31db4921e5f5f36fe9d184.tar.bz2 open-keychain-4e60f1bc75a7727ebc31db4921e5f5f36fe9d184.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
| -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 cbd8ce47a..7ad7b4d0f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java @@ -79,8 +79,8 @@ public class PgpSecurityConstants { */ private static HashSet<Integer> sHashAlgorithmsWhitelist = new HashSet<>(Arrays.asList( // MD5: broken - // SHA1: broken - // RIPEMD160: same security properties as SHA1 + HashAlgorithmTags.SHA1, // TODO: disable when SHA256 is widely deployed + HashAlgorithmTags.RIPEMD160, // same security properties as SHA1, TODO: disable when SHA256 is widely deployed // DOUBLE_SHA: not used widely // MD2: not used widely // TIGER_192: not used widely |