cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change security defaults from SHA-512 to SHA-256

Browse Source 
No good reason to use SHA-512 here, since SHA-256 stood the test of
time.
This commit is contained in:
Vincent Breitmoser
2024-02-21 17:21:57 +01:00
parent 3e3d09ae6d
commit 4a33dfbb20
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSecurityConstants.java
View File

@@ -81,7 +81,7 @@ public class PgpSecurityConstants {
// MD2: not used widely // MD2: not used widely
// TIGER_192: not used widely // TIGER_192: not used widely
// HAVAL_5_160: not used widely // HAVAL_5_160: not used widely
HashAlgorithmTags.SHA256, // compatibility for old Mailvelope versions HashAlgorithmTags.SHA256, // solid default
HashAlgorithmTags.SHA384, // affine padding attacks; unproven status of RSA-PKCSv15 HashAlgorithmTags.SHA384, // affine padding attacks; unproven status of RSA-PKCSv15
HashAlgorithmTags.SHA512 HashAlgorithmTags.SHA512
// SHA224: issues with collision resistance of 112-bits, Not used widely // SHA224: issues with collision resistance of 112-bits, Not used widely
@@ -177,7 +177,7 @@ public class PgpSecurityConstants {
* (Most preferred is first) * (Most preferred is first)
*/ */
public static final int[] PREFERRED_HASH_ALGORITHMS = new int[]{ public static final int[] PREFERRED_HASH_ALGORITHMS = new int[]{
HashAlgorithmTags.SHA512, // If possible use SHA-512, this is state of the art! HashAlgorithmTags.SHA256,
}; };
/** /**
@@ -196,7 +196,7 @@ public class PgpSecurityConstants {
/** /**
* Hash algorithm used to certify public keys * Hash algorithm used to certify public keys
*/ */
public static final int CERTIFY_HASH_ALGO = HashAlgorithmTags.SHA512; public static final int CERTIFY_HASH_ALGO = HashAlgorithmTags.SHA256;
/** /**
@@ -213,7 +213,7 @@ public class PgpSecurityConstants {
* Always use SHA-512! * Always use SHA-512!
* We always ignore the preferred hash algos of the recipient! * We always ignore the preferred hash algos of the recipient!
*/ */
public static final int DEFAULT_HASH_ALGORITHM = HashAlgorithmTags.SHA512; public static final int DEFAULT_HASH_ALGORITHM = HashAlgorithmTags.SHA256;
public interface OpenKeychainHashAlgorithmTags extends HashAlgorithmTags { public interface OpenKeychainHashAlgorithmTags extends HashAlgorithmTags {
int USE_DEFAULT = -1; int USE_DEFAULT = -1;
@@ -254,9 +254,9 @@ public class PgpSecurityConstants {
* 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) * 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 = 0x90; 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_HASH_ALGO = HashAlgorithmTags.SHA256;
public static final int SECRET_KEY_ENCRYPTOR_SYMMETRIC_ALGO = SymmetricKeyAlgorithmTags.AES_256; public static final int SECRET_KEY_ENCRYPTOR_SYMMETRIC_ALGO = SymmetricKeyAlgorithmTags.AES_256;
public static final int SECRET_KEY_BINDING_SIGNATURE_HASH_ALGO = HashAlgorithmTags.SHA512; public static final int SECRET_KEY_BINDING_SIGNATURE_HASH_ALGO = HashAlgorithmTags.SHA256;
// NOTE: only SHA1 is supported for key checksum calculations in OpenPGP, // NOTE: only SHA1 is supported for key checksum calculations in OpenPGP,
// see http://tools.ietf.org/html/rfc488 0#section-5.5.3 // see http://tools.ietf.org/html/rfc488 0#section-5.5.3
public static final int SECRET_KEY_SIGNATURE_CHECKSUM_HASH_ALGO = HashAlgorithmTags.SHA1; public static final int SECRET_KEY_SIGNATURE_CHECKSUM_HASH_ALGO = HashAlgorithmTags.SHA1;

2
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
View File

@@ -256,7 +256,7 @@ public class PgpKeyOperationTest {
PGPSecretKey secretKey = ((PGPSecretKeyRing) result.getRing().mRing).getSecretKey(); PGPSecretKey secretKey = ((PGPSecretKeyRing) result.getRing().mRing).getSecretKey();
assertEquals(S2K.SALTED_AND_ITERATED, secretKey.getS2K().getType()); assertEquals(S2K.SALTED_AND_ITERATED, secretKey.getS2K().getType());
assertEquals(HashAlgorithmTags.SHA512, secretKey.getS2K().getHashAlgorithm()); assertEquals(HashAlgorithmTags.SHA256, secretKey.getS2K().getHashAlgorithm());
assertEquals(-1, secretKey.getS2K().getProtectionMode()); assertEquals(-1, secretKey.getS2K().getProtectionMode());
assertEquals(SecretKeyPacket.USAGE_CHECKSUM, secretKey.getS2KUsage()); assertEquals(SecretKeyPacket.USAGE_CHECKSUM, secretKey.getS2KUsage());
} }