From 79bb30ce957dbe86b3e79e1ef0f2f9436328cc43 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Tue, 13 Aug 2024 17:45:31 +0200 Subject: [PATCH] Remove the old Mojang key --- .../cloudburstmc/protocol/bedrock/util/EncryptionUtils.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/util/EncryptionUtils.java b/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/util/EncryptionUtils.java index 7905cb367..519321656 100644 --- a/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/util/EncryptionUtils.java +++ b/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/util/EncryptionUtils.java @@ -29,13 +29,10 @@ @UtilityClass public class EncryptionUtils { private static final ECPublicKey MOJANG_PUBLIC_KEY; - private static final ECPublicKey OLD_MOJANG_PUBLIC_KEY; private static final SecureRandom SECURE_RANDOM = new SecureRandom(); private static final String MOJANG_PUBLIC_KEY_BASE64 = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAECRXueJeTDqNRRgJi/vlRufByu/2G0i2Ebt6YMar5QX/R0DIIyrJMcUpruK4QveTfJSTp3Shlq4Gk34cD/4GUWwkv0DVuzeuB+tXija7HBxii03NHDbPAD0AKnLr2wdAp"; - private static final String OLD_MOJANG_PUBLIC_KEY_BASE64 = - "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE8ELkixyLcwlZryUQcu1TvPOmI2B7vX83ndnWRUaXm74wFfa5f/lwQNTfrLVHa2PmenpGI6JhIMUJaWZrjmMj90NoKNFSNBuKdm8rYiXsfaz3K36x/1U26HpG0ZxK/V1V"; private static final KeyPairGenerator KEY_PAIR_GEN; public static final String ALGORITHM_TYPE = AlgorithmIdentifiers.ECDSA_USING_P384_CURVE_AND_SHA384; @@ -52,7 +49,6 @@ public class EncryptionUtils { KEY_PAIR_GEN = KeyPairGenerator.getInstance("EC"); KEY_PAIR_GEN.initialize(new ECGenParameterSpec("secp384r1")); MOJANG_PUBLIC_KEY = parseKey(MOJANG_PUBLIC_KEY_BASE64); - OLD_MOJANG_PUBLIC_KEY = parseKey(OLD_MOJANG_PUBLIC_KEY_BASE64); } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | InvalidKeySpecException e) { throw new AssertionError("Unable to initialize required encryption", e); } @@ -124,7 +120,7 @@ public static ChainValidationResult validateChain(List chain) } // the second chain entry has to be signed by Mojang - if (i == 1 && (!currentKey.equals(MOJANG_PUBLIC_KEY) && !currentKey.equals(OLD_MOJANG_PUBLIC_KEY))) { + if (i == 1 && !currentKey.equals(MOJANG_PUBLIC_KEY)) { throw new IllegalStateException("The chain isn't signed by Mojang!"); }