Merge branch 'SpigotMC-master'

HexagonMC · Mar 31, 2016 · 48903ae · 48903ae
2 parents 7f88d8a + 05588c9
commit 48903ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -42,13 +42,13 @@ public static void writeArray(byte[] b, ByteBuf buf)
 
     public static byte[] readArray(ByteBuf buf)
     {
-        return readArray( buf, Short.MAX_VALUE );
+        return readArray( buf, buf.readableBytes() );
     }
 
     public static byte[] readArray(ByteBuf buf, int limit)
     {
         int len = readVarInt( buf );
-        Preconditions.checkArgument( len <= limit, "Cannot receive byte array longer than %d (got %s bytes)", limit, len );
+        Preconditions.checkArgument( len <= limit, "Cannot receive byte array longer than %s (got %s bytes)", limit, len );
         byte[] ret = new byte[ len ];
         buf.readBytes( ret );
         return ret;

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
@@ -30,8 +30,8 @@ public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protoco
             verifyToken = readArrayLegacy( buf );
         } else
         {
-            publicKey = readArray( buf, 128 );
-            verifyToken = readArray( buf, 128 );
+            publicKey = readArray( buf );
+            verifyToken = readArray( buf );
         }
     }
 

diff --git a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
@@ -37,7 +37,9 @@ public class EncryptionUtil
     {
         try
         {
-            keys = KeyPairGenerator.getInstance( "RSA" ).generateKeyPair();
+            KeyPairGenerator generator = KeyPairGenerator.getInstance( "RSA" );
+            generator.initialize( 1024 );
+            keys = generator.generateKeyPair();
         } catch ( NoSuchAlgorithmException ex )
         {
             throw new ExceptionInInitializerError( ex );