PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

I don't think an all 0 key poses an issue. Also increase logging when cannot connect to server.

Browse Source
This commit is contained in:
md_5 2012-11-19 20:39:24 +11:00
parent 02e00313bd
commit dbca9acac3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/md_5/bungee/EncryptionUtil.java
View File

@ -14,7 +14,6 @@ import java.security.KeyPairGenerator;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.PublicKey; import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.Security; import java.security.Security;
import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec; import java.security.spec.X509EncodedKeySpec;
@ -43,6 +42,7 @@ public class EncryptionUtil
private static final Random random = new Random(); private static final Random random = new Random();
private static KeyPair keys; private static KeyPair keys;
private static SecretKey secret = new SecretKeySpec(new byte[16], "AES");
static static
{ {
@ -114,9 +114,7 @@ public class EncryptionUtil
public static SecretKey getSecret() public static SecretKey getSecret()
{ {
byte[] rand = new byte[16]; return secret;
random.nextBytes(rand);
return new SecretKeySpec(rand, "AES");
} }
public static PublicKey getPubkey(PacketFDEncryptionRequest request) throws InvalidKeySpecException, NoSuchAlgorithmException public static PublicKey getPubkey(PacketFDEncryptionRequest request) throws InvalidKeySpecException, NoSuchAlgorithmException

2
src/main/java/net/md_5/bungee/ServerConnection.java
View File

@ -87,7 +87,7 @@ public class ServerConnection extends GenericConnection
return connect(user, name, def, handshake, false); return connect(user, name, def, handshake, false);
} else } else
{ {
throw new RuntimeException("Could not connect to target server"); throw new RuntimeException("Could not connect to target server " + Util.exception(ex));
} }
} }
} }