diff --git a/Artifacts/SubServers.Bungee.Patcher.sh b/Artifacts/SubServers.Bungee.Patcher.sh index c5e579ee..0b1a4a28 100644 --- a/Artifacts/SubServers.Bungee.Patcher.sh +++ b/Artifacts/SubServers.Bungee.Patcher.sh @@ -4,7 +4,7 @@ #!/usr/bin/env bash if [ -z "$1" ] then - echo "SubServers Library Patcher: Combines BungeeCord and SubServers.Bungee/SubServers.Sync into one jar file" + echo "SubServers Library Patcher: Combines BungeeCord and SubServers.Bungee/SubServers.Sync into one jar file" echo "Usage: bash $0 " exit 1 fi @@ -39,6 +39,9 @@ if [ $retvala -eq 0 ] if [ -f "LICENSE" ]; then rm -Rf LICENSE fi + if [ -f "MODIFICATIONS" ]; then + mv -f MODIFICATIONS ../MODIFICATIONS + fi echo ">> Extracting $2..." mkdir ../Vanilla.jar cd ../Vanilla.jar @@ -49,11 +52,16 @@ if [ $retvala -eq 0 ] yes | cp -rf . ../Modded.jar printf "\n " >> META-INF/MANIFEST.MF if [ -f "MODIFICATIONS" ]; then - mv -f MODIFICATIONS ../MODIFICATIONS - else - printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > ../MODIFICATIONS + if [ -f "../MODIFICATIONS" ]; then + cat MODIFICATIONS >> ../MODIFICATIONS + else + mv -f MODIFICATIONS ../MODIFICATIONS + fi fi cd ../ + if [ ! -f "MODIFICATIONS" ]; then + printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS + fi printf "@ `date`\n> git --no-pager diff --no-index --name-status BuildTools/Vanilla.jar BuildTools/Modded.jar\n" >> MODIFICATIONS git --no-pager diff --no-index --name-status Vanilla.jar Modded.jar | sed -e "s/\tVanilla.jar\//\t\//" -e "s/\tModded.jar\//\t\//" >> MODIFICATIONS mv -f MODIFICATIONS Modded.jar @@ -66,6 +74,8 @@ if [ $retvala -eq 0 ] if [ $retvalc -eq 0 ] then echo ">> Cleaning Up..." + cd ../../ + rm -Rf BuildTools exit 0; else echo ">> Error Recomiling Files" diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index ffa61f8a..e443b05e 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Client.Bukkit.jar b/Artifacts/SubServers.Client.Bukkit.jar index 44d47de8..81f1dab4 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index e5a14a45..03c24eaa 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Artifacts/SubServers.Sync.jar b/Artifacts/SubServers.Sync.jar index 0b499261..45c87cc0 100644 Binary files a/Artifacts/SubServers.Sync.jar and b/Artifacts/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index 6ca36422..a42fb241 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Bungee/allclasses-frame.html b/Javadoc/SubServers.Bungee/allclasses-frame.html index b31cb45e..b1722c01 100644 --- a/Javadoc/SubServers.Bungee/allclasses-frame.html +++ b/Javadoc/SubServers.Bungee/allclasses-frame.html @@ -11,11 +11,12 @@

All Classes

    -
  • AES
    • -
  • AES.InvalidAESStreamException
    • -
  • AES.InvalidKeyLengthException
    • -
  • AES.InvalidPasswordException
    • -
  • AES.StrongEncryptionNotAvailableException
    • +
  • AES
    • +
  • AES.InvalidAESStreamException
    • +
  • AES.InvalidKeyLengthException
    • +
  • AES.InvalidPasswordException
    • +
  • AES.StrongEncryptionNotAvailableException
    • +
  • Cipher
  • Client
  • ClientHandler
  • CommandX
    • @@ -85,7 +86,6 @@
  • SubCreator.ServerType
  • SubCreatorException
  • SubDataServer
    • -
  • SubDataServer.Encryption
  • SubEditServerEvent
  • SubEvent
  • SubLogFilter
    • diff --git a/Javadoc/SubServers.Bungee/allclasses-noframe.html b/Javadoc/SubServers.Bungee/allclasses-noframe.html index b19c082c..6ac2fce8 100644 --- a/Javadoc/SubServers.Bungee/allclasses-noframe.html +++ b/Javadoc/SubServers.Bungee/allclasses-noframe.html @@ -11,11 +11,12 @@

    All Classes

      -
    • AES
      • -
    • AES.InvalidAESStreamException
      • -
    • AES.InvalidKeyLengthException
      • -
    • AES.InvalidPasswordException
      • -
    • AES.StrongEncryptionNotAvailableException
      • +
    • AES
      • +
    • AES.InvalidAESStreamException
      • +
    • AES.InvalidKeyLengthException
      • +
    • AES.InvalidPasswordException
      • +
    • AES.StrongEncryptionNotAvailableException
      • +
    • Cipher
    • Client
    • ClientHandler
    • CommandX
      • @@ -85,7 +86,6 @@
    • SubCreator.ServerType
    • SubCreatorException
    • SubDataServer
      • -
    • SubDataServer.Encryption
    • SubEditServerEvent
    • SubEvent
    • SubLogFilter
      • diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index ae7d1bbe..806bb594 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -72,6 +72,10 @@

      A

      +
      addCipher(String, Cipher) - Static method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      +
      +
      Add a Cipher for use by SubData
      +
      addClient(Socket) - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      Add a Client to the Network
      @@ -146,25 +150,27 @@
      addSubServer(UUID, String, boolean, int, String, boolean, String, Executable, String, boolean, boolean, boolean, boolean, boolean) - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalHost
       
      -
      AES - Class in net.ME1312.SubServers.Bungee.Network
      +
      AES - Class in net.ME1312.SubServers.Bungee.Network.Ciphers
      A class to perform password-based AES encryption and decryption in CBC mode.
      -
      AES() - Constructor for class net.ME1312.SubServers.Bungee.Network.AES
      -
       
      -
      AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Bungee.Network
      +
      AES(int) - Constructor for class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      +
      +
      Constructor for use as a SubData Cipher
      +
      +
      AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Bungee.Network.Ciphers
      Thrown if an attempt is made to decrypt an invalid AES stream.
      -
      AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Bungee.Network
      +
      AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Bungee.Network.Ciphers
      Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
      -
      AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Bungee.Network
      +
      AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Bungee.Network.Ciphers
      Thrown if an attempt is made to decrypt a stream with an incorrect password.
      -
      AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Bungee.Network
      +
      AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Bungee.Network.Ciphers
      Thrown if 192- or 256-bit AES encryption or decryption is attempted, but not available on the particular Java platform.
      @@ -296,6 +302,10 @@

      C

      +
      Cipher - Interface in net.ME1312.SubServers.Bungee.Network
      +
      +
      SubData Cipher Layout Class
      +
      clear() - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
      Remove all Objects from this YAML Section
      @@ -416,13 +426,17 @@

      D

      -
      decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Bungee.Network.AES
      +
      decrypt(String, byte[]) - Method in interface net.ME1312.SubServers.Bungee.Network.Cipher
      -
      Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
      +
      Decrypt Encrypted JSON Data
      -
      decrypt(String, byte[]) - Static method in class net.ME1312.SubServers.Bungee.Network.AES
      +
      decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      -
      Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
      +
      Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
      +
      +
      decrypt(String, byte[]) - Method in class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      +
      +
      This method calls to AES.decrypt(String, InputStream, OutputStream)), simplified for the Cipher interface.
      deleteDirectory(File) - Static method in class net.ME1312.SubServers.Bungee.Library.Util
      @@ -482,13 +496,17 @@
      Edits the Server
      -
      encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Bungee.Network.AES
      +
      encrypt(String, JSONObject) - Method in interface net.ME1312.SubServers.Bungee.Network.Cipher
      +
      +
      Encrypt JSON Data
      +
      +
      encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      Encrypts a stream of data.
      -
      encrypt(int, String, String) - Static method in class net.ME1312.SubServers.Bungee.Network.AES
      +
      encrypt(String, JSONObject) - Method in class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      -
      Encrypts a stream of data.
      +
      This method calls to AES.encrypt(int, String, InputStream, OutputStream), simplified for the Cipher interface.
      equals(Object) - Method in class net.ME1312.SubServers.Bungee.Library.Container
       
      @@ -830,6 +848,18 @@
      Get an item from a map ignoring case
      +
      getCipher() - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      +
      +
      Gets the Server's Cipher
      +
      +
      getCipher(String) - Static method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      +
      +
      Gets a Cipher by Handle
      +
      +
      getCiphers() - Static method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      +
      +
      Gets the Ciphers
      +
      getClient(Socket) - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      Grabs a Client from the Network
      @@ -954,10 +984,6 @@
      Gets the edit to be made
      -
      getEncryption() - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
      -
      -
      Gets the Server's Encryption method
      -
      getExecutable() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
       
      getExecutable() - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubServer
      @@ -1262,6 +1288,12 @@
      Gets the Name of the task logging
      +
      getName() - Method in interface net.ME1312.SubServers.Bungee.Network.Cipher
      +
      +
      Get the name of this Cipher
      +
      +
      getName() - Method in class net.ME1312.SubServers.Bungee.Network.Ciphers.AES
      +
       
      getName() - Method in class net.ME1312.SubServers.Bungee.SubPlugin
      Further override BungeeCord's signature when patched into the same jar
      @@ -1746,9 +1778,9 @@
      Creates an Internal SubServer
      -
      InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Bungee.Network.AES.InvalidAESStreamException
      +
      InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidAESStreamException
       
      -
      InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Bungee.Network.AES.InvalidAESStreamException
      +
      InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidAESStreamException
       
      invalidateObjectSignature(String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
      @@ -1770,7 +1802,7 @@
       
      InvalidHostException(String) - Constructor for exception net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException
       
      -
      InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Bungee.Network.AES.InvalidPasswordException
      +
      InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidPasswordException
       
      InvalidServerException - Exception in net.ME1312.SubServers.Bungee.Library.Exception
      @@ -2124,6 +2156,8 @@
       
      net.ME1312.SubServers.Bungee.Network - package net.ME1312.SubServers.Bungee.Network
       
      +
      net.ME1312.SubServers.Bungee.Network.Ciphers - package net.ME1312.SubServers.Bungee.Network.Ciphers
      +
       
      net.ME1312.SubServers.Bungee.Network.Packet - package net.ME1312.SubServers.Bungee.Network.Packet
       
      @@ -2958,7 +2992,7 @@
      Reset all changes made by startListeners
      -
      StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Bungee.Network.AES.StrongEncryptionNotAvailableException
      +
      StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Bungee.Network.Ciphers.AES.StrongEncryptionNotAvailableException
       
      SubAddHostEvent - Class in net.ME1312.SubServers.Bungee.Event
      @@ -3024,12 +3058,10 @@
      SubDataServer Class
      -
      SubDataServer(SubPlugin, int, InetAddress, SubDataServer.Encryption) - Constructor for class net.ME1312.SubServers.Bungee.Network.SubDataServer
      +
      SubDataServer(SubPlugin, int, InetAddress, Cipher) - Constructor for class net.ME1312.SubServers.Bungee.Network.SubDataServer
      SubData Server Instance
      -
      SubDataServer.Encryption - Enum in net.ME1312.SubServers.Bungee.Network
      -
       
      SubEditServerEvent - Class in net.ME1312.SubServers.Bungee.Event
      Server Edit Event
      @@ -3324,10 +3356,6 @@
      Returns the enum constant of this type with the specified name.
      -
      valueOf(String) - Static method in enum net.ME1312.SubServers.Bungee.Network.SubDataServer.Encryption
      -
      -
      Returns the enum constant of this type with the specified name.
      -
      values() - Static method in enum net.ME1312.SubServers.Bungee.Host.SubCreator.ServerType
      Returns an array containing the constants of this enum type, in @@ -3338,11 +3366,6 @@ the order they are declared.
      Returns an array containing the constants of this enum type, in the order they are declared.
      -
      values() - Static method in enum net.ME1312.SubServers.Bungee.Network.SubDataServer.Encryption
      -
      -
      Returns an array containing the constants of this enum type, in -the order they are declared.
      -
      Version - Class in net.ME1312.SubServers.Bungee.Library.Version
      Version Class
      diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.html deleted file mode 100644 index 61261235..00000000 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.html +++ /dev/null @@ -1,468 +0,0 @@ - - - - - -AES (SubServers.Bungee) - - - - - - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - -
      -
      net.ME1312.SubServers.Bungee.Network
      -

      Class AES

      -
      -
      -
        -
      • java.lang.Object
        • -
      • -
          -
        • net.ME1312.SubServers.Bungee.Network.AES
          • -
        -
        • -
      -
      - -
      -
      -
        -
      • - -
          -
        • - - -

          Nested Class Summary

          - - - - - - - - - - - - - - - - - - - - - - -
          Nested Classes 
          Modifier and TypeClass and Description
          static class AES.InvalidAESStreamException -
          Thrown if an attempt is made to decrypt an invalid AES stream.
          -
          static class AES.InvalidKeyLengthException -
          Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
          -
          static class AES.InvalidPasswordException -
          Thrown if an attempt is made to decrypt a stream with an incorrect password.
          -
          static class AES.StrongEncryptionNotAvailableException -
          Thrown if 192- or 256-bit AES encryption or decryption is attempted, - but not available on the particular Java platform.
          -
          -
          • -
        - -
          -
        • - - -

          Constructor Summary

          - - - - - - - - -
          Constructors 
          Constructor and Description
          AES() 
          -
          • -
        - - -
        • -
      -
      -
      -
        -
      • - -
          -
        • - - -

          Constructor Detail

          - - - -
            -
          • -

            AES

            -
            public AES()
            -
            • -
          -
          • -
        - -
          -
        • - - -

          Method Detail

          - - - -
            -
          • -

            encrypt

            -
            public static void encrypt(int keyLength,
-                           java.lang.String password,
-                           java.io.InputStream input,
-                           java.io.OutputStream output)
-                    throws AES.InvalidKeyLengthException,
-                           AES.StrongEncryptionNotAvailableException,
-                           java.io.IOException
            -
            Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
            -
              -
            • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
              • -
            • salt: pseudorandom salt used to derive keys from password (16 bytes)
              • -
            • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
              • -
            • IV: pseudorandom AES initialization vector (16 bytes)
              • -
            -
            -
            Parameters:
            -
            keyLength - key length to use for AES encryption (must be 128, 192, or 256)
            -
            password - password to use for encryption
            -
            input - an arbitrary byte stream to encrypt
            -
            output - stream to which encrypted data will be written
            -
            Throws:
            -
            AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
            -
            AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
            -
            java.io.IOException
            -
            -
            • -
          - - - -
            -
          • -

            encrypt

            -
            public static byte[] encrypt(int keyLength,
-                             java.lang.String password,
-                             java.lang.String input)
-                      throws java.io.IOException,
-                             AES.StrongEncryptionNotAvailableException,
-                             AES.InvalidKeyLengthException
            -
            Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
            -
              -
            • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
              • -
            • salt: pseudorandom salt used to derive keys from password (16 bytes)
              • -
            • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
              • -
            • IV: pseudorandom AES initialization vector (16 bytes)
              • -
            -
            -
            Parameters:
            -
            keyLength - key length to use for AES encryption (must be 128, 192, or 256)
            -
            password - password to use for encryption
            -
            input - an arbitrary string to encrypt
            -
            Returns:
            -
            string containing the encrypted data
            -
            Throws:
            -
            AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
            -
            AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
            -
            java.io.IOException
            -
            -
            • -
          - - - - - - - - -
          • -
        -
        • -
      -
      -
      - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Cipher.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Cipher.html new file mode 100644 index 00000000..9c6b3b81 --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Cipher.html @@ -0,0 +1,286 @@ + + + + + +Cipher (SubServers.Bungee) + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      +
        +
      • Summary: 
        • +
      • Nested | 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
        +
      • Detail: 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
      + + +
      + + +
      +
      net.ME1312.SubServers.Bungee.Network
      +

      Interface Cipher

      +
      +
      +
      +
        +
      • +
        +
        All Known Implementing Classes:
        +
        AES
        +
        +
        +
        +
        public interface Cipher
        +
        SubData Cipher Layout Class
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Method Summary

          + + + + + + + + + + + + + + + + + + +
          All Methods Instance Methods Abstract Methods 
          Modifier and TypeMethod and Description
          org.json.JSONObjectdecrypt(java.lang.String key, + byte[] data) +
          Decrypt Encrypted JSON Data
          +
          byte[]encrypt(java.lang.String key, + org.json.JSONObject data) +
          Encrypt JSON Data
          +
          java.lang.StringgetName() +
          Get the name of this Cipher
          +
          +
          • +
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Method Detail

          + + + +
            +
          • +

            getName

            +
            java.lang.String getName()
            +
            Get the name of this Cipher
            +
            +
            Returns:
            +
            Cipher Name
            +
            +
            • +
          + + + +
            +
          • +

            encrypt

            +
            byte[] encrypt(java.lang.String key,
+               org.json.JSONObject data)
+        throws java.lang.Exception
            +
            Encrypt JSON Data
            +
            +
            Parameters:
            +
            key - Key to Encrypt Data with
            +
            data - Data to Encrypt
            +
            Returns:
            +
            Encrypted Data Array
            +
            Throws:
            +
            java.lang.Exception
            +
            +
            • +
          + + + +
            +
          • +

            decrypt

            +
            org.json.JSONObject decrypt(java.lang.String key,
+                            byte[] data)
+                     throws java.lang.Exception
            +
            Decrypt Encrypted JSON Data
            +
            +
            Parameters:
            +
            key - Key to Decrypt Data with
            +
            data - Encrypted Data Array
            +
            Returns:
            +
            JSON Data
            +
            Throws:
            +
            java.lang.Exception
            +
            +
            • +
          +
          • +
        +
        • +
      +
      +
      + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      +
        +
      • Summary: 
        • +
      • Nested | 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
        +
      • Detail: 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
      + + +
      + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.InvalidAESStreamException.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.InvalidAESStreamException.html similarity index 69% rename from Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.InvalidAESStreamException.html rename to Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.InvalidAESStreamException.html index 4f701190..47c95481 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/AES.InvalidAESStreamException.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.InvalidAESStreamException.html @@ -4,8 +4,8 @@ AES.InvalidAESStreamException (SubServers.Bungee) - - + + + + + + @@ -11,7 +11,7 @@ @@ -11,14 +11,14 @@ + + +

      net.ME1312.SubServers.Bungee.Network.Ciphers

      +
      +

      Classes

      + +

      Exceptions

      + +
      + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-summary.html new file mode 100644 index 00000000..edfa888a --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-summary.html @@ -0,0 +1,177 @@ + + + + + +net.ME1312.SubServers.Bungee.Network.Ciphers (SubServers.Bungee) + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      + + +
      + +
      +

      Package net.ME1312.SubServers.Bungee.Network.Ciphers

      +
      +
      +
        +
      • + + + + + + + + + + + + +
        Class Summary 
        ClassDescription
        AES +
        A class to perform password-based AES encryption and decryption in CBC mode.
        +
        +
        • +
      • + + + + + + + + + + + + + + + + + + + + + + + + +
        Exception Summary 
        ExceptionDescription
        AES.InvalidAESStreamException +
        Thrown if an attempt is made to decrypt an invalid AES stream.
        +
        AES.InvalidKeyLengthException +
        Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
        +
        AES.InvalidPasswordException +
        Thrown if an attempt is made to decrypt a stream with an incorrect password.
        +
        AES.StrongEncryptionNotAvailableException +
        Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
        +
        +
        • +
      +
      + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      + + +
      + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-tree.html new file mode 100644 index 00000000..d1a76849 --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Ciphers/package-tree.html @@ -0,0 +1,146 @@ + + + + + +net.ME1312.SubServers.Bungee.Network.Ciphers Class Hierarchy (SubServers.Bungee) + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      + + +
      + +
      +

      Hierarchy For Package net.ME1312.SubServers.Bungee.Network.Ciphers

      +Package Hierarchies: + +
      +
      +

      Class Hierarchy

      + +
      + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      + + +
      + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Client.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Client.html index da30c542..77ce783d 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Client.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Client.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
      @@ -381,7 +381,7 @@ extends java.lang.Object
      diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-summary.html index 286fe7df..e92ab907 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-summary.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-summary.html @@ -41,7 +41,7 @@
      @@ -282,7 +282,7 @@
      diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-tree.html index 7ef335fc..433815c1 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-tree.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/package-tree.html @@ -41,7 +41,7 @@
      @@ -142,7 +142,7 @@
      diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.Encryption.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.Encryption.html deleted file mode 100644 index 5afbe67c..00000000 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.Encryption.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - -SubDataServer.Encryption (SubServers.Bungee) - - - - - - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - -
      -
      net.ME1312.SubServers.Bungee.Network
      -

      Enum SubDataServer.Encryption

      -
      -
      -
        -
      • java.lang.Object
        • -
      • - -
        • -
      -
      - -
      -
      -
        -
      • - - - -
          -
        • - - -

          Method Summary

          - - - - - - - - - - - - - - -
          All Methods Static Methods Concrete Methods 
          Modifier and TypeMethod and Description
          static SubDataServer.EncryptionvalueOf(java.lang.String name) -
          Returns the enum constant of this type with the specified name.
          -
          static SubDataServer.Encryption[]values() -
          Returns an array containing the constants of this enum type, in -the order they are declared.
          -
          -
            -
          • - - -

            Methods inherited from class java.lang.Enum

            -compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
            • -
          -
            -
          • - - -

            Methods inherited from class java.lang.Object

            -getClass, notify, notifyAll, wait, wait, wait
            • -
          -
          • -
        -
        • -
      -
      -
      -
        -
      • - - - -
          -
        • - - -

          Method Detail

          - - - -
            -
          • -

            values

            -
            public static SubDataServer.Encryption[] values()
            -
            Returns an array containing the constants of this enum type, in -the order they are declared. This method may be used to iterate -over the constants as follows: -
            -for (SubDataServer.Encryption c : SubDataServer.Encryption.values())
-    System.out.println(c);
-
            -
            -
            Returns:
            -
            an array containing the constants of this enum type, in the order they are declared
            -
            -
            • -
          - - - -
            -
          • -

            valueOf

            -
            public static SubDataServer.Encryption valueOf(java.lang.String name)
            -
            Returns the enum constant of this type with the specified name. -The string must match exactly an identifier used to declare an -enum constant in this type. (Extraneous whitespace characters are -not permitted.)
            -
            -
            Parameters:
            -
            name - the name of the enum constant to be returned.
            -
            Returns:
            -
            the enum constant with the specified name
            -
            Throws:
            -
            java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
            -
            java.lang.NullPointerException - if the argument is null
            -
            -
            • -
          -
          • -
        -
        • -
      -
      -
      - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html index e6091ea0..0225d7bc 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":9,"i13":9,"i14":10,"i15":10,"i16":10,"i17":9,"i18":9}; +var methods = {"i0":9,"i1":10,"i2":9,"i3":10,"i4":9,"i5":10,"i6":10,"i7":9,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10,"i15":9,"i16":9,"i17":10,"i18":10,"i19":10,"i20":9,"i21":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
      • Frames
        • @@ -72,7 +72,7 @@ var activeTableTab = "activeTableTab";
        • Summary: 
          • -
        • Nested | 
          • +
        • Nested | 
        • Field | 
        • Constr | 
        • Method
          • @@ -116,25 +116,6 @@ extends java.lang.Object
          • - -
              -
            • - - -

              Nested Class Summary

              - - - - - - - - - - -
              Nested Classes 
              Modifier and TypeClass and Description
              static class SubDataServer.Encryption 
              -
              • -
            • @@ -147,10 +128,10 @@ extends java.lang.Object Constructor and Description -SubDataServer(SubPlugin plugin, +SubDataServer(SubPlugin plugin, int port, java.net.InetAddress address, - SubDataServer.Encryption encryption) + Cipher cipher)
              SubData Server Instance
              @@ -170,117 +151,136 @@ extends java.lang.Object Method and Description +static void +addCipher(java.lang.String handle, + Cipher cipher) +
              Add a Cipher for use by SubData
              + + + Client addClient(java.net.Socket socket)
              Add a Client to the Network
              - + static void allowConnection(java.lang.String address)
              Allow Connections from an Address
              - + void broadcastPacket(PacketOut packet)
              Broadcast a Packet to everything on the Network
              Warning: There are usually different types of applications on the network at once, they may not recognise the same packet handles
              - + static void denyConnection(java.lang.String address)
              Deny Connections from an Address
              - + void destroy()
              Drops All Connections and Stops the SubData Listener
              - + +Cipher +getCipher() +
              Gets the Server's Cipher
              + + + +static Cipher +getCipher(java.lang.String handle) +
              Gets a Cipher by Handle
              + + + +static java.util.Map<java.lang.String,Cipher> +getCiphers() +
              Gets the Ciphers
              + + + Client getClient(java.net.InetSocketAddress address)
              Grabs a Client from the Network
              - + Client getClient(java.net.Socket socket)
              Grabs a Client from the Network
              - + Client getClient(java.lang.String address)
              Grabs a Client from the Network
              - + java.util.Collection<Client> getClients()
              Grabs all the Clients on the Network
              - -SubDataServer.Encryption -getEncryption() -
              Gets the Server's Encryption method
              - - - + static java.util.List<? extends PacketIn> getPacket(java.lang.String handle)
              Grab PacketIn Instances via handle
              - + java.net.ServerSocket getServer()
              Gets the Server Socket
              - + static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle)
              Register PacketOut to the Network
              - + static void registerPacket(PacketIn packet, java.lang.String handle)
              Register PacketIn to the Network
              - + void removeClient(Client client)
              Remove a Client from the Network
              - + void removeClient(java.net.InetSocketAddress address)
              Remove a Client from the Network
              - + void removeClient(java.lang.String address)
              Remove a Client from the Network
              - + static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
              Unregister PacketOut to the Network
              - + static void unregisterPacket(PacketIn packet)
              Unregister PacketIn from the Network
              @@ -308,7 +308,7 @@ extends java.lang.Object

              Constructor Detail

              - +
                @@ -317,7 +317,7 @@ extends java.lang.Object 
                public SubDataServer(SubPlugin plugin,
                      int port,
                      java.net.InetAddress address,
-                     SubDataServer.Encryption encryption)
+                     Cipher cipher)
               throws java.io.IOException
                SubData Server Instance
                @@ -325,7 +325,7 @@ extends java.lang.Object
                plugin - SubPlugin
                port - Port
                address - Bind
                -
                encryption - Encryption Type
                +
                cipher - Cipher (or null for none)
                Throws:
                java.io.IOException
                @@ -353,17 +353,63 @@ extends java.lang.Object
              - +
              • -

                getEncryption

                -
                public SubDataServer.Encryption getEncryption()
                -
                Gets the Server's Encryption method
                +

                addCipher

                +
                public static void addCipher(java.lang.String handle,
+                             Cipher cipher)
                +
                Add a Cipher for use by SubData
                +
                +
                Parameters:
                +
                cipher - Cipher to Add
                +
                handle - Handle to Bind
                +
                +
                • +
              + + + +
                +
              • +

                getCiphers

                +
                public static java.util.Map<java.lang.String,Cipher> getCiphers()
                +
                Gets the Ciphers
                Returns:
                -
                Encryption method
                +
                Cipher Map
                +
                +
                • +
              + + + +
                +
              • +

                getCipher

                +
                public Cipher getCipher()
                +
                Gets the Server's Cipher
                +
                +
                Returns:
                +
                Cipher
                +
                +
                • +
              + + + +
                +
              • +

                getCipher

                +
                public static Cipher getCipher(java.lang.String handle)
                +
                Gets a Cipher by Handle
                +
                +
                Parameters:
                +
                handle - Handle
                +
                Returns:
                +
                Cipher
              @@ -659,7 +705,7 @@ extends java.lang.Object
              • Frames
                • @@ -683,7 +729,7 @@ extends java.lang.Object
                • Summary: 
                  • -
                • Nested | 
                  • +
                • Nested | 
                • Field | 
                • Constr | 
                • Method
                  • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-frame.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-frame.html index a890e439..f6b2174a 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-frame.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-frame.html @@ -12,27 +12,16 @@

                  Interfaces

                  Classes

                  -

                  Enums

                  - -

                  Exceptions

                  -
                  diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-summary.html index 72def0bb..9b87350f 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-summary.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/package-summary.html @@ -42,7 +42,7 @@
                  @@ -204,7 +153,7 @@
                  @@ -91,7 +92,7 @@
                  • java.lang.Object
                      -
                    • net.ME1312.SubServers.Bungee.Network.AES
                      • +
                    • net.ME1312.SubServers.Bungee.Network.Ciphers.AES (implements net.ME1312.SubServers.Bungee.Network.Cipher)
                    • net.md_5.bungee.BungeeServerInfo (implements net.md_5.bungee.api.config.ServerInfo)
                      • net.ME1312.SubServers.Bungee.Host.ServerContainer (implements net.ME1312.SubServers.Bungee.Host.Server) @@ -210,10 +211,10 @@
                        • java.lang.Exception
                            -
                          • net.ME1312.SubServers.Bungee.Network.AES.InvalidAESStreamException
                            • -
                          • net.ME1312.SubServers.Bungee.Network.AES.InvalidKeyLengthException
                            • -
                          • net.ME1312.SubServers.Bungee.Network.AES.InvalidPasswordException
                            • -
                          • net.ME1312.SubServers.Bungee.Network.AES.StrongEncryptionNotAvailableException
                            • +
                          • net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidAESStreamException
                            • +
                          • net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidKeyLengthException
                            • +
                          • net.ME1312.SubServers.Bungee.Network.Ciphers.AES.InvalidPasswordException
                            • +
                          • net.ME1312.SubServers.Bungee.Network.Ciphers.AES.StrongEncryptionNotAvailableException
                          • java.lang.RuntimeException
                            • java.lang.IllegalStateException @@ -242,6 +243,7 @@

                            Interface Hierarchy

                              +
                            • net.ME1312.SubServers.Bungee.Network.Cipher
                            • net.ME1312.SubServers.Bungee.Network.ClientHandler
                              • net.ME1312.SubServers.Bungee.Host.Server (also extends net.ME1312.SubServers.Bungee.Library.ExtraDataHandler, net.md_5.bungee.api.config.ServerInfo) @@ -286,7 +288,6 @@
                              • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
                                • diff --git a/Javadoc/SubServers.Bungee/package-list b/Javadoc/SubServers.Bungee/package-list index 84ef0cb6..2c9352dc 100644 --- a/Javadoc/SubServers.Bungee/package-list +++ b/Javadoc/SubServers.Bungee/package-list @@ -10,4 +10,5 @@ net.ME1312.SubServers.Bungee.Library.Config net.ME1312.SubServers.Bungee.Library.Exception net.ME1312.SubServers.Bungee.Library.Version net.ME1312.SubServers.Bungee.Network +net.ME1312.SubServers.Bungee.Network.Ciphers net.ME1312.SubServers.Bungee.Network.Packet diff --git a/Javadoc/SubServers.Bungee/serialized-form.html b/Javadoc/SubServers.Bungee/serialized-form.html index 3e57b03d..3dadf6c4 100644 --- a/Javadoc/SubServers.Bungee/serialized-form.html +++ b/Javadoc/SubServers.Bungee/serialized-form.html @@ -168,27 +168,27 @@
                            • -

                              Package net.ME1312.SubServers.Bungee.Network

                              +

                              Package net.ME1312.SubServers.Bungee.Network.Ciphers

                              • diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index a99cc073..0c34f4e5 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html b/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html index 80a4a89f..2ef1ff33 100644 --- a/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html +++ b/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html @@ -11,11 +11,12 @@

                              All Classes

                                -
                              • AES
                                • -
                              • AES.InvalidAESStreamException
                                • -
                              • AES.InvalidKeyLengthException
                                • -
                              • AES.InvalidPasswordException
                                • -
                              • AES.StrongEncryptionNotAvailableException
                                • +
                              • AES
                                • +
                              • AES.InvalidAESStreamException
                                • +
                              • AES.InvalidKeyLengthException
                                • +
                              • AES.InvalidPasswordException
                                • +
                              • AES.StrongEncryptionNotAvailableException
                                • +
                              • Cipher
                              • Container
                              • ExtraDataHandler
                              • IllegalPacketException
                                • @@ -48,7 +49,6 @@
                              • SubCommand
                              • SubCreateEvent
                              • SubDataClient
                                • -
                              • SubDataClient.Encryption
                              • SubEditServerEvent
                              • SubEvent
                              • SubNetworkConnectEvent
                                • diff --git a/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html b/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html index fadd9fff..e7db1c22 100644 --- a/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html +++ b/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html @@ -11,11 +11,12 @@

                                All Classes

                                  -
                                • AES
                                  • -
                                • AES.InvalidAESStreamException
                                  • -
                                • AES.InvalidKeyLengthException
                                  • -
                                • AES.InvalidPasswordException
                                  • -
                                • AES.StrongEncryptionNotAvailableException
                                  • +
                                • AES
                                  • +
                                • AES.InvalidAESStreamException
                                  • +
                                • AES.InvalidKeyLengthException
                                  • +
                                • AES.InvalidPasswordException
                                  • +
                                • AES.StrongEncryptionNotAvailableException
                                  • +
                                • Cipher
                                • Container
                                • ExtraDataHandler
                                • IllegalPacketException
                                  • @@ -48,7 +49,6 @@
                                • SubCommand
                                • SubCreateEvent
                                • SubDataClient
                                  • -
                                • SubDataClient.Encryption
                                • SubEditServerEvent
                                • SubEvent
                                • SubNetworkConnectEvent
                                  • diff --git a/Javadoc/SubServers.Client.Bukkit/index-all.html b/Javadoc/SubServers.Client.Bukkit/index-all.html index dadb8cc2..0e420632 100644 --- a/Javadoc/SubServers.Client.Bukkit/index-all.html +++ b/Javadoc/SubServers.Client.Bukkit/index-all.html @@ -72,6 +72,10 @@

                                  A

                                  +
                                  addCipher(String, Cipher) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  +
                                  +
                                  Add a Cipher for use by SubData
                                  +
                                  addExtra(String, Object) - Method in interface net.ME1312.SubServers.Client.Bukkit.Library.ExtraDataHandler
                                  Add an extra value to this Server
                                  @@ -88,25 +92,27 @@
                                  Add SubServer Plugin
                                  -
                                  AES - Class in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  AES - Class in net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  A class to perform password-based AES encryption and decryption in CBC mode.
                                  -
                                  AES() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.AES
                                  -
                                   
                                  -
                                  AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  AES(int) - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  +
                                  +
                                  Constructor for use as a SubData Cipher
                                  +
                                  +
                                  AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  Thrown if an attempt is made to decrypt an invalid AES stream.
                                  -
                                  AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                  -
                                  AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                  -
                                  AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  Thrown if 192- or 256-bit AES encryption or decryption is attempted, but not available on the particular Java platform.
                                  @@ -235,6 +241,10 @@
                                  callback(String, JSONCallback) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInRunEvent
                                   
                                  +
                                  Cipher - Interface in net.ME1312.SubServers.Client.Bukkit.Network
                                  +
                                  +
                                  SubData Cipher Layout Class
                                  +
                                  clean(PlayerQuitEvent) - Method in class net.ME1312.SubServers.Client.Bukkit.Graphic.InternalUIHandler
                                  Clean Renderers
                                  @@ -303,13 +313,17 @@

                                  D

                                  -
                                  decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.AES
                                  +
                                  decrypt(String, byte[]) - Method in interface net.ME1312.SubServers.Client.Bukkit.Network.Cipher
                                  -
                                  Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                  +
                                  Decrypt Encrypted JSON Data
                                  -
                                  decrypt(String, byte[]) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.AES
                                  +
                                  decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  -
                                  Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                  +
                                  Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                  +
                                  +
                                  decrypt(String, byte[]) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  +
                                  +
                                  This method calls to AES.decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                  deleteDirectory(File) - Static method in class net.ME1312.SubServers.Client.Bukkit.Library.Util
                                  @@ -331,13 +345,17 @@

                                  E

                                  -
                                  encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.AES
                                  +
                                  encrypt(String, JSONObject) - Method in interface net.ME1312.SubServers.Client.Bukkit.Network.Cipher
                                  +
                                  +
                                  Encrypt JSON Data
                                  +
                                  +
                                  encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  Encrypts a stream of data.
                                  -
                                  encrypt(int, String, String) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.AES
                                  +
                                  encrypt(String, JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  -
                                  Encrypts a stream of data.
                                  +
                                  This method calls to AES.encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                  equals(Version) - Method in class net.ME1312.SubServers.Client.Bukkit.Library.Version.Version
                                  @@ -481,9 +499,21 @@
                                  Get an item from a map ignoring case
                                  +
                                  getCipher() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  +
                                  +
                                  Gets the Client's Cipher
                                  +
                                  +
                                  getCipher(String) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  +
                                  +
                                  Gets a Cipher by Handle
                                  +
                                  +
                                  getCiphers() - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  +
                                  +
                                  Gets the Ciphers
                                  +
                                  getClient() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  -
                                  Gets the Server Socket
                                  +
                                  Gets the Client Socket
                                  getColoredString(String, char) - Method in class net.ME1312.SubServers.Client.Bukkit.Library.Config.YAMLSection
                                  @@ -529,10 +559,6 @@
                                  Gets the edit to be made
                                  -
                                  getEncryption() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  -
                                  -
                                  Gets the Connection's Encryption method
                                  -
                                  getExtra(String) - Method in interface net.ME1312.SubServers.Client.Bukkit.Library.ExtraDataHandler
                                  Get an extra value
                                  @@ -727,6 +753,12 @@
                                  Gets the Server Name
                                  +
                                  getName() - Method in interface net.ME1312.SubServers.Client.Bukkit.Network.Cipher
                                  +
                                  +
                                  Get the name of this Cipher
                                  +
                                  +
                                  getName() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                  +
                                   
                                  getName() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  Gets the Assigned Server Name
                                  @@ -1095,11 +1127,11 @@
                                  Internal GUI Renderer Class
                                  -
                                  InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.AES.InvalidAESStreamException
                                  +
                                  InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES.InvalidAESStreamException
                                   
                                  -
                                  InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.AES.InvalidAESStreamException
                                  +
                                  InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES.InvalidAESStreamException
                                   
                                  -
                                  InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.AES.InvalidPasswordException
                                  +
                                  InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES.InvalidPasswordException
                                   
                                  isBoolean(String) - Method in class net.ME1312.SubServers.Client.Bukkit.Library.Config.YAMLSection
                                  @@ -1225,6 +1257,8 @@
                                   
                                  net.ME1312.SubServers.Client.Bukkit.Network - package net.ME1312.SubServers.Client.Bukkit.Network
                                   
                                  +
                                  net.ME1312.SubServers.Client.Bukkit.Network.Ciphers - package net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  +
                                   
                                  net.ME1312.SubServers.Client.Bukkit.Network.Packet - package net.ME1312.SubServers.Client.Bukkit.Network.Packet
                                   
                                  newUI() - Method in class net.ME1312.SubServers.Client.Bukkit.Graphic.InternalUIRenderer
                                  @@ -1619,7 +1653,7 @@
                                  Sets the Server Version
                                  -
                                  StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.AES.StrongEncryptionNotAvailableException
                                  +
                                  StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES.StrongEncryptionNotAvailableException
                                   
                                  SubAddHostEvent - Class in net.ME1312.SubServers.Client.Bukkit.Event
                                  @@ -1659,12 +1693,10 @@
                                  SubData Direct Client Class
                                  -
                                  SubDataClient(SubPlugin, String, InetAddress, int, SubDataClient.Encryption) - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  +
                                  SubDataClient(SubPlugin, String, InetAddress, int, Cipher) - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
                                  SubServers Client Instance
                                  -
                                  SubDataClient.Encryption - Enum in net.ME1312.SubServers.Client.Bukkit.Network
                                  -
                                   
                                  SubEditServerEvent - Class in net.ME1312.SubServers.Client.Bukkit.Event
                                  Server Edit Event
                                  @@ -1861,15 +1893,6 @@

                                  V

                                  -
                                  valueOf(String) - Static method in enum net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient.Encryption
                                  -
                                  -
                                  Returns the enum constant of this type with the specified name.
                                  -
                                  -
                                  values() - Static method in enum net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient.Encryption
                                  -
                                  -
                                  Returns an array containing the constants of this enum type, in -the order they are declared.
                                  -
                                  Version - Class in net.ME1312.SubServers.Client.Bukkit.Library.Version
                                  Version Class
                                  diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.html new file mode 100644 index 00000000..a89f97a4 --- /dev/null +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.html @@ -0,0 +1,286 @@ + + + + + +Cipher (SubServers.Client.Bukkit) + + + + + + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  +
                                  +
                                    +
                                  • Summary: 
                                    • +
                                  • Nested | 
                                    • +
                                  • Field | 
                                    • +
                                  • Constr | 
                                    • +
                                  • Method
                                    • +
                                  +
                                    +
                                  • Detail: 
                                    • +
                                  • Field | 
                                    • +
                                  • Constr | 
                                    • +
                                  • Method
                                    • +
                                  +
                                  + + +
                                  + + +
                                  +
                                  net.ME1312.SubServers.Client.Bukkit.Network
                                  +

                                  Interface Cipher

                                  +
                                  +
                                  +
                                  +
                                    +
                                  • +
                                    +
                                    All Known Implementing Classes:
                                    +
                                    AES
                                    +
                                    +
                                    +
                                    +
                                    public interface Cipher
                                    +
                                    SubData Cipher Layout Class
                                    +
                                    • +
                                  +
                                  +
                                  +
                                    +
                                  • + +
                                      +
                                    • + + +

                                      Method Summary

                                      + + + + + + + + + + + + + + + + + + +
                                      All Methods Instance Methods Abstract Methods 
                                      Modifier and TypeMethod and Description
                                      org.json.JSONObjectdecrypt(java.lang.String key, + byte[] data) +
                                      Decrypt Encrypted JSON Data
                                      +
                                      byte[]encrypt(java.lang.String key, + org.json.JSONObject data) +
                                      Encrypt JSON Data
                                      +
                                      java.lang.StringgetName() +
                                      Get the name of this Cipher
                                      +
                                      +
                                      • +
                                    +
                                    • +
                                  +
                                  +
                                  +
                                    +
                                  • + +
                                      +
                                    • + + +

                                      Method Detail

                                      + + + +
                                        +
                                      • +

                                        getName

                                        +
                                        java.lang.String getName()
                                        +
                                        Get the name of this Cipher
                                        +
                                        +
                                        Returns:
                                        +
                                        Cipher Name
                                        +
                                        +
                                        • +
                                      + + + +
                                        +
                                      • +

                                        encrypt

                                        +
                                        byte[] encrypt(java.lang.String key,
+               org.json.JSONObject data)
+        throws java.lang.Exception
                                        +
                                        Encrypt JSON Data
                                        +
                                        +
                                        Parameters:
                                        +
                                        key - Key to Encrypt Data with
                                        +
                                        data - Data to Encrypt
                                        +
                                        Returns:
                                        +
                                        Encrypted Data Array
                                        +
                                        Throws:
                                        +
                                        java.lang.Exception
                                        +
                                        +
                                        • +
                                      + + + +
                                        +
                                      • +

                                        decrypt

                                        +
                                        org.json.JSONObject decrypt(java.lang.String key,
+                            byte[] data)
+                     throws java.lang.Exception
                                        +
                                        Decrypt Encrypted JSON Data
                                        +
                                        +
                                        Parameters:
                                        +
                                        key - Key to Decrypt Data with
                                        +
                                        data - Encrypted Data Array
                                        +
                                        Returns:
                                        +
                                        JSON Data
                                        +
                                        Throws:
                                        +
                                        java.lang.Exception
                                        +
                                        +
                                        • +
                                      +
                                      • +
                                    +
                                    • +
                                  +
                                  +
                                  + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  +
                                  +
                                    +
                                  • Summary: 
                                    • +
                                  • Nested | 
                                    • +
                                  • Field | 
                                    • +
                                  • Constr | 
                                    • +
                                  • Method
                                    • +
                                  +
                                    +
                                  • Detail: 
                                    • +
                                  • Field | 
                                    • +
                                  • Constr | 
                                    • +
                                  • Method
                                    • +
                                  +
                                  + + +
                                  + + + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.InvalidAESStreamException.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.InvalidAESStreamException.html similarity index 67% rename from Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.InvalidAESStreamException.html rename to Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.InvalidAESStreamException.html index c7defe4d..0d9be569 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.InvalidAESStreamException.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.InvalidAESStreamException.html @@ -3,15 +3,15 @@ -AES.InvalidAESStreamException (SubServers.Host) - - +AES.InvalidAESStreamException (SubServers.Client.Bukkit) + + +AES.InvalidKeyLengthException (SubServers.Client.Bukkit) + + +AES.InvalidPasswordException (SubServers.Client.Bukkit) + + +AES.StrongEncryptionNotAvailableException (SubServers.Client.Bukkit) + + + + + + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  +
                                  + + +
                                  + + +
                                  + + +
                                  +
                                  net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                  +

                                  Class AES

                                  +
                                  +
                                  +
                                    +
                                  • java.lang.Object
                                    • +
                                  • +
                                      +
                                    • net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES
                                      • +
                                    +
                                    • +
                                  +
                                  + +
                                  +
                                  +
                                    +
                                  • + +
                                      +
                                    • + + +

                                      Nested Class Summary

                                      + + + + + + + + + + + + + + + + + + + + + + +
                                      Nested Classes 
                                      Modifier and TypeClass and Description
                                      static class AES.InvalidAESStreamException +
                                      Thrown if an attempt is made to decrypt an invalid AES stream.
                                      +
                                      static class AES.InvalidKeyLengthException +
                                      Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                      +
                                      static class AES.InvalidPasswordException +
                                      Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                      +
                                      static class AES.StrongEncryptionNotAvailableException +
                                      Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                      +
                                      +
                                      • +
                                    + +
                                      +
                                    • + + +

                                      Constructor Summary

                                      + + + + + + + + +
                                      Constructors 
                                      Constructor and Description
                                      AES(int keyLength) +
                                      Constructor for use as a SubData Cipher
                                      +
                                      +
                                      • +
                                    + + +
                                    • +
                                  +
                                  +
                                  +
                                    +
                                  • + +
                                      +
                                    • + + +

                                      Constructor Detail

                                      + + + +
                                        +
                                      • +

                                        AES

                                        +
                                        public AES(int keyLength)
                                        +
                                        Constructor for use as a SubData Cipher
                                        +
                                        • +
                                      +
                                      • +
                                    + +
                                      +
                                    • + + +

                                      Method Detail

                                      + + + +
                                        +
                                      • +

                                        encrypt

                                        +
                                        public static void encrypt(int keyLength,
+                           java.lang.String password,
+                           java.io.InputStream input,
+                           java.io.OutputStream output)
+                    throws AES.InvalidKeyLengthException,
+                           AES.StrongEncryptionNotAvailableException,
+                           java.io.IOException
                                        +
                                        Encrypts a stream of data. The encrypted stream consists of a header + followed by the raw AES data. The header is broken down as follows:
                                        +
                                          +
                                        • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                          • +
                                        • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                          • +
                                        • authentication key (derived from password and salt, used to + check validity of password upon decryption) (8 bytes)
                                          • +
                                        • IV: pseudorandom AES initialization vector (16 bytes)
                                          • +
                                        +
                                        +
                                        Parameters:
                                        +
                                        keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                        +
                                        password - password to use for encryption
                                        +
                                        input - an arbitrary byte stream to encrypt
                                        +
                                        output - stream to which encrypted data will be written
                                        +
                                        Throws:
                                        +
                                        AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                        +
                                        AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction + policy files do not allow 192- or 256-bit encryption
                                        +
                                        java.io.IOException
                                        +
                                        +
                                        • +
                                      + + + +
                                        +
                                      • +

                                        encrypt

                                        +
                                        public byte[] encrypt(java.lang.String key,
+                      org.json.JSONObject data)
+               throws java.lang.Exception
                                        +
                                        This method calls to encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                        +
                                        +
                                        Specified by:
                                        +
                                        encrypt in interface Cipher
                                        +
                                        Parameters:
                                        +
                                        key - Key to Encrypt Data with
                                        +
                                        data - Data to Encrypt
                                        +
                                        Returns:
                                        +
                                        Encrypted Data Array
                                        +
                                        Throws:
                                        +
                                        java.lang.Exception
                                        +
                                        +
                                        • +
                                      + + + +
                                        +
                                      • +

                                        getName

                                        +
                                        public java.lang.String getName()
                                        +
                                        Description copied from interface: Cipher
                                        +
                                        Get the name of this Cipher
                                        +
                                        +
                                        Specified by:
                                        +
                                        getName in interface Cipher
                                        +
                                        Returns:
                                        +
                                        Cipher Name
                                        +
                                        +
                                        • +
                                      + + + + + + + +
                                        +
                                      • +

                                        decrypt

                                        +
                                        public org.json.JSONObject decrypt(java.lang.String key,
+                                   byte[] data)
+                            throws java.lang.Exception
                                        +
                                        This method calls to decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                        +
                                        +
                                        Specified by:
                                        +
                                        decrypt in interface Cipher
                                        +
                                        Parameters:
                                        +
                                        key - Key to Decrypt Data with
                                        +
                                        data - Encrypted Data Array
                                        +
                                        Returns:
                                        +
                                        JSON Data
                                        +
                                        Throws:
                                        +
                                        java.lang.Exception
                                        +
                                        +
                                        • +
                                      +
                                      • +
                                    +
                                    • +
                                  +
                                  +
                                  + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  +
                                  + + +
                                  + + +
                                  + + + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-frame.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-frame.html new file mode 100644 index 00000000..49c1e5b9 --- /dev/null +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-frame.html @@ -0,0 +1,26 @@ + + + + + +net.ME1312.SubServers.Client.Bukkit.Network.Ciphers (SubServers.Client.Bukkit) + + + + +

                                  net.ME1312.SubServers.Client.Bukkit.Network.Ciphers

                                  +
                                  +

                                  Classes

                                  + +

                                  Exceptions

                                  + +
                                  + + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-summary.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-summary.html new file mode 100644 index 00000000..60b07a33 --- /dev/null +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-summary.html @@ -0,0 +1,177 @@ + + + + + +net.ME1312.SubServers.Client.Bukkit.Network.Ciphers (SubServers.Client.Bukkit) + + + + + + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  + + +
                                  + +
                                  +

                                  Package net.ME1312.SubServers.Client.Bukkit.Network.Ciphers

                                  +
                                  +
                                  +
                                    +
                                  • + + + + + + + + + + + + +
                                    Class Summary 
                                    ClassDescription
                                    AES +
                                    A class to perform password-based AES encryption and decryption in CBC mode.
                                    +
                                    +
                                    • +
                                  • + + + + + + + + + + + + + + + + + + + + + + + + +
                                    Exception Summary 
                                    ExceptionDescription
                                    AES.InvalidAESStreamException +
                                    Thrown if an attempt is made to decrypt an invalid AES stream.
                                    +
                                    AES.InvalidKeyLengthException +
                                    Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                    +
                                    AES.InvalidPasswordException +
                                    Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                    +
                                    AES.StrongEncryptionNotAvailableException +
                                    Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                    +
                                    +
                                    • +
                                  +
                                  + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  + + +
                                  + + + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-tree.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-tree.html new file mode 100644 index 00000000..06413ed6 --- /dev/null +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/package-tree.html @@ -0,0 +1,146 @@ + + + + + +net.ME1312.SubServers.Client.Bukkit.Network.Ciphers Class Hierarchy (SubServers.Client.Bukkit) + + + + + + + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  + + +
                                  + +
                                  +

                                  Hierarchy For Package net.ME1312.SubServers.Client.Bukkit.Network.Ciphers

                                  +Package Hierarchies: + +
                                  +
                                  +

                                  Class Hierarchy

                                  + +
                                  + +
                                  + + +
                                  Skip navigation links
                                  + + + + +
                                  +
                                  + + + +
                                  + +
                                  + + +
                                  + + + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-summary.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-summary.html index 566e84c4..0f316b91 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-summary.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-summary.html @@ -41,7 +41,7 @@
                                  @@ -197,7 +197,7 @@
                                  diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-tree.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-tree.html index 007ce0ea..40ca2377 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-tree.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/package-tree.html @@ -41,7 +41,7 @@
                                  @@ -119,7 +119,7 @@
                                  diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/PacketIn.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/PacketIn.html index 12a3f3fc..b482dfa4 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/PacketIn.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/PacketIn.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
                                  @@ -208,7 +208,7 @@ var activeTableTab = "activeTableTab";
                                  diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.Encryption.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.Encryption.html deleted file mode 100644 index acc42cfb..00000000 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.Encryption.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - -SubDataClient.Encryption (SubServers.Client.Bukkit) - - - - - - - -
                                  - - -
                                  Skip navigation links
                                  - - - - -
                                  -
                                  - - - -
                                  - -
                                  -
                                  - - -
                                  - - -
                                  - - -
                                  -
                                  net.ME1312.SubServers.Client.Bukkit.Network
                                  -

                                  Enum SubDataClient.Encryption

                                  -
                                  -
                                  -
                                    -
                                  • java.lang.Object
                                    • -
                                  • -
                                      -
                                    • java.lang.Enum<SubDataClient.Encryption>
                                      • -
                                    • -
                                        -
                                      • net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient.Encryption
                                        • -
                                      -
                                      • -
                                    -
                                    • -
                                  -
                                  - -
                                  -
                                  -
                                    -
                                  • - - - -
                                      -
                                    • - - -

                                      Method Summary

                                      - - - - - - - - - - - - - - -
                                      All Methods Static Methods Concrete Methods 
                                      Modifier and TypeMethod and Description
                                      static SubDataClient.EncryptionvalueOf(java.lang.String name) -
                                      Returns the enum constant of this type with the specified name.
                                      -
                                      static SubDataClient.Encryption[]values() -
                                      Returns an array containing the constants of this enum type, in -the order they are declared.
                                      -
                                      -
                                        -
                                      • - - -

                                        Methods inherited from class java.lang.Enum

                                        -compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                                        • -
                                      -
                                        -
                                      • - - -

                                        Methods inherited from class java.lang.Object

                                        -getClass, notify, notifyAll, wait, wait, wait
                                        • -
                                      -
                                      • -
                                    -
                                    • -
                                  -
                                  -
                                  -
                                    -
                                  • - - - -
                                      -
                                    • - - -

                                      Method Detail

                                      - - - -
                                        -
                                      • -

                                        values

                                        -
                                        public static SubDataClient.Encryption[] values()
                                        -
                                        Returns an array containing the constants of this enum type, in -the order they are declared. This method may be used to iterate -over the constants as follows: -
                                        -for (SubDataClient.Encryption c : SubDataClient.Encryption.values())
-    System.out.println(c);
-
                                        -
                                        -
                                        Returns:
                                        -
                                        an array containing the constants of this enum type, in the order they are declared
                                        -
                                        -
                                        • -
                                      - - - -
                                        -
                                      • -

                                        valueOf

                                        -
                                        public static SubDataClient.Encryption valueOf(java.lang.String name)
                                        -
                                        Returns the enum constant of this type with the specified name. -The string must match exactly an identifier used to declare an -enum constant in this type. (Extraneous whitespace characters are -not permitted.)
                                        -
                                        -
                                        Parameters:
                                        -
                                        name - the name of the enum constant to be returned.
                                        -
                                        Returns:
                                        -
                                        the enum constant with the specified name
                                        -
                                        Throws:
                                        -
                                        java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                                        -
                                        java.lang.NullPointerException - if the argument is null
                                        -
                                        -
                                        • -
                                      -
                                      • -
                                    -
                                    • -
                                  -
                                  -
                                  - - -
                                  - - -
                                  Skip navigation links
                                  - - - - -
                                  -
                                  - - - -
                                  - -
                                  -
                                  - - -
                                  - - -
                                  - - - diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html index d3e2c3aa..e793a4ab 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":9,"i8":9,"i9":10,"i10":9,"i11":9}; +var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":9,"i7":10,"i8":10,"i9":9,"i10":9,"i11":9,"i12":10,"i13":9,"i14":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
                                  • Frames
                                    • @@ -72,7 +72,7 @@ var activeTableTab = "activeTableTab";
                                    • Summary: 
                                      • -
                                    • Nested | 
                                      • +
                                    • Nested | 
                                    • Field | 
                                    • Constr | 
                                    • Method
                                      • @@ -116,25 +116,6 @@ extends java.lang.Object
                                      • - -
                                          -
                                        • - - -

                                          Nested Class Summary

                                          - - - - - - - - - - -
                                          Nested Classes 
                                          Modifier and TypeClass and Description
                                          static class SubDataClient.Encryption 
                                          -
                                          • -
                                        • @@ -147,11 +128,11 @@ extends java.lang.Object Constructor and Description -SubDataClient(SubPlugin plugin, +SubDataClient(SubPlugin plugin, java.lang.String name, java.net.InetAddress address, int port, - SubDataClient.Encryption encryption) + Cipher cipher)
                                          SubServers Client Instance
                                          @@ -171,75 +152,94 @@ extends java.lang.Object Method and Description +static void +addCipher(java.lang.String handle, + Cipher cipher) +
                                          Add a Cipher for use by SubData
                                          + + + void broadcastPacket(PacketOut packet)
                                          Broadcast packet to all Clients
                                          - + void destroy(int reconnect)
                                          Drops All Connections and Stops the SubData Listener
                                          - + void forwardPacket(PacketOut packet, java.lang.String location)
                                          Forward Packet to Client
                                          - -java.net.Socket -getClient() -
                                          Gets the Server Socket
                                          - - -SubDataClient.Encryption -getEncryption() -
                                          Gets the Connection's Encryption method
                                          +Cipher +getCipher() +
                                          Gets the Client's Cipher
                                          +static Cipher +getCipher(java.lang.String handle) +
                                          Gets a Cipher by Handle
                                          + + + +static java.util.Map<java.lang.String,Cipher> +getCiphers() +
                                          Gets the Ciphers
                                          + + + +java.net.Socket +getClient() +
                                          Gets the Client Socket
                                          + + + java.lang.String getName()
                                          Gets the Assigned Server Name
                                          - + static java.util.List<? extends PacketIn> getPacket(java.lang.String handle)
                                          Grab PacketIn Instances via handle
                                          - + static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle)
                                          Register PacketOut to the Network
                                          - + static void registerPacket(PacketIn packet, java.lang.String handle)
                                          Register PacketIn to the Network
                                          - + void sendPacket(PacketOut packet)
                                          Send Packet to Server
                                          - + static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
                                          Unregister PacketOut to the Network
                                          - + static void unregisterPacket(PacketIn packet)
                                          Unregister PacketIn from the Network
                                          @@ -267,7 +267,7 @@ extends java.lang.Object

                                          Constructor Detail

                                          - +
                                            @@ -277,7 +277,7 @@ extends java.lang.Object java.lang.String name, java.net.InetAddress address, int port, - SubDataClient.Encryption encryption) + Cipher cipher) throws java.io.IOException
                                            SubServers Client Instance
                                            @@ -286,7 +286,7 @@ extends java.lang.Object
                                            name - Server Name
                                            address - Address
                                            port - Port
                                            -
                                            encryption - Encryption Type
                                            +
                                            cipher - Cipher
                                            Throws:
                                            java.io.IOException
                                            @@ -321,24 +321,70 @@ extends java.lang.Object

                                          • getClient

                                            public java.net.Socket getClient()
                                            -
                                            Gets the Server Socket
                                            +
                                            Gets the Client Socket
                                            Returns:
                                            -
                                            Server Socket
                                            +
                                            Client Socket
                                          - +
                                          • -

                                            getEncryption

                                            -
                                            public SubDataClient.Encryption getEncryption()
                                            -
                                            Gets the Connection's Encryption method
                                            +

                                            addCipher

                                            +
                                            public static void addCipher(java.lang.String handle,
+                             Cipher cipher)
                                            +
                                            Add a Cipher for use by SubData
                                            +
                                            +
                                            Parameters:
                                            +
                                            cipher - Cipher to Add
                                            +
                                            handle - Handle to Bind
                                            +
                                            +
                                            • +
                                          + + + +
                                            +
                                          • +

                                            getCiphers

                                            +
                                            public static java.util.Map<java.lang.String,Cipher> getCiphers()
                                            +
                                            Gets the Ciphers
                                            Returns:
                                            -
                                            Encryption method
                                            +
                                            Cipher Map
                                            +
                                            +
                                            • +
                                          + + + +
                                            +
                                          • +

                                            getCipher

                                            +
                                            public Cipher getCipher()
                                            +
                                            Gets the Client's Cipher
                                            +
                                            +
                                            Returns:
                                            +
                                            Cipher
                                            +
                                            +
                                            • +
                                          + + + +
                                            +
                                          • +

                                            getCipher

                                            +
                                            public static Cipher getCipher(java.lang.String handle)
                                            +
                                            Gets a Cipher by Handle
                                            +
                                            +
                                            Parameters:
                                            +
                                            handle - Handle
                                            +
                                            Returns:
                                            +
                                            Cipher
                                          @@ -505,7 +551,7 @@ extends java.lang.Object
                                        • -

                                          Package net.ME1312.SubServers.Client.Bukkit.Network

                                          +

                                          Package net.ME1312.SubServers.Client.Bukkit.Network.Ciphers
                                          • diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index 95de9887..d55fe494 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Host/allclasses-frame.html b/Javadoc/SubServers.Host/allclasses-frame.html index 6c5a88fc..3a4f0ed4 100644 --- a/Javadoc/SubServers.Host/allclasses-frame.html +++ b/Javadoc/SubServers.Host/allclasses-frame.html @@ -11,12 +11,13 @@

                                          All Classes

                                            -
                                          • AES
                                            • -
                                          • AES.InvalidAESStreamException
                                            • -
                                          • AES.InvalidKeyLengthException
                                            • -
                                          • AES.InvalidPasswordException
                                            • -
                                          • AES.StrongEncryptionNotAvailableException
                                            • +
                                          • AES
                                            • +
                                          • AES.InvalidAESStreamException
                                            • +
                                          • AES.InvalidKeyLengthException
                                            • +
                                          • AES.InvalidPasswordException
                                            • +
                                          • AES.StrongEncryptionNotAvailableException
                                          • Cancellable
                                            • +
                                          • Cipher
                                          • Command
                                          • CommandPreProcessEvent
                                          • Container
                                            • @@ -76,7 +77,6 @@
                                          • SubCreator.ServerType
                                          • SubCreatorException
                                          • SubDataClient
                                            • -
                                          • SubDataClient.Encryption
                                          • SubDisableEvent
                                          • SubEditServerEvent
                                          • SubEnableEvent
                                            • diff --git a/Javadoc/SubServers.Host/allclasses-noframe.html b/Javadoc/SubServers.Host/allclasses-noframe.html index 9f289ffb..12c74f13 100644 --- a/Javadoc/SubServers.Host/allclasses-noframe.html +++ b/Javadoc/SubServers.Host/allclasses-noframe.html @@ -11,12 +11,13 @@

                                            All Classes

                                              -
                                            • AES
                                              • -
                                            • AES.InvalidAESStreamException
                                              • -
                                            • AES.InvalidKeyLengthException
                                              • -
                                            • AES.InvalidPasswordException
                                              • -
                                            • AES.StrongEncryptionNotAvailableException
                                              • +
                                            • AES
                                              • +
                                            • AES.InvalidAESStreamException
                                              • +
                                            • AES.InvalidKeyLengthException
                                              • +
                                            • AES.InvalidPasswordException
                                              • +
                                            • AES.StrongEncryptionNotAvailableException
                                            • Cancellable
                                              • +
                                            • Cipher
                                            • Command
                                            • CommandPreProcessEvent
                                            • Container
                                              • @@ -76,7 +77,6 @@
                                            • SubCreator.ServerType
                                            • SubCreatorException
                                            • SubDataClient
                                              • -
                                            • SubDataClient.Encryption
                                            • SubDisableEvent
                                            • SubEditServerEvent
                                            • SubEnableEvent
                                              • diff --git a/Javadoc/SubServers.Host/index-all.html b/Javadoc/SubServers.Host/index-all.html index a1ee3066..9a2c448a 100644 --- a/Javadoc/SubServers.Host/index-all.html +++ b/Javadoc/SubServers.Host/index-all.html @@ -72,6 +72,10 @@

                                              A

                                              +
                                              addCipher(String, Cipher) - Static method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              +
                                              +
                                              Add a Cipher for use by SubData
                                              +
                                              addCommand(Command, String...) - Method in class net.ME1312.SubServers.Host.SubAPI
                                              Registers a Command
                                              @@ -82,25 +86,27 @@
                                              Add an extra value to this Server
                                              -
                                              AES - Class in net.ME1312.SubServers.Host.Network
                                              +
                                              AES - Class in net.ME1312.SubServers.Host.Network.Ciphers
                                              A class to perform password-based AES encryption and decryption in CBC mode.
                                              -
                                              AES() - Constructor for class net.ME1312.SubServers.Host.Network.AES
                                              -
                                               
                                              -
                                              AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Host.Network
                                              +
                                              AES(int) - Constructor for class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              +
                                              +
                                              Constructor for use as a SubData Cipher
                                              +
                                              +
                                              AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Host.Network.Ciphers
                                              Thrown if an attempt is made to decrypt an invalid AES stream.
                                              -
                                              AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Host.Network
                                              +
                                              AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Host.Network.Ciphers
                                              Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                              -
                                              AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Host.Network
                                              +
                                              AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Host.Network.Ciphers
                                              Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                              -
                                              AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Host.Network
                                              +
                                              AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Host.Network.Ciphers
                                              Thrown if 192- or 256-bit AES encryption or decryption is attempted, but not available on the particular Java platform.
                                              @@ -231,6 +237,10 @@
                                              Cancel a task
                                              +
                                              Cipher - Interface in net.ME1312.SubServers.Host.Network
                                              +
                                              +
                                              SubData Cipher Layout Class
                                              +
                                              clear() - Method in class net.ME1312.SubServers.Host.Library.Config.YAMLSection
                                              Remove all Objects from this YAML Section
                                              @@ -303,13 +313,17 @@

                                              D

                                              -
                                              decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Host.Network.AES
                                              +
                                              decrypt(String, byte[]) - Method in interface net.ME1312.SubServers.Host.Network.Cipher
                                              -
                                              Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                              +
                                              Decrypt Encrypted JSON Data
                                              -
                                              decrypt(String, byte[]) - Static method in class net.ME1312.SubServers.Host.Network.AES
                                              +
                                              decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              -
                                              Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                              +
                                              Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                              +
                                              +
                                              decrypt(String, byte[]) - Method in class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              +
                                              +
                                              This method calls to AES.decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                              delay(long) - Method in class net.ME1312.SubServers.Host.API.SubTask
                                              @@ -345,13 +359,17 @@
                                              EARLY - Static variable in class net.ME1312.SubServers.Host.Library.Event.EventOrder
                                               
                                              -
                                              encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Host.Network.AES
                                              +
                                              encrypt(String, JSONObject) - Method in interface net.ME1312.SubServers.Host.Network.Cipher
                                              +
                                              +
                                              Encrypt JSON Data
                                              +
                                              +
                                              encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              Encrypts a stream of data.
                                              -
                                              encrypt(int, String, String) - Static method in class net.ME1312.SubServers.Host.Network.AES
                                              +
                                              encrypt(String, JSONObject) - Method in class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              -
                                              Encrypts a stream of data.
                                              +
                                              This method calls to AES.encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                              end() - Static method in class net.ME1312.SubServers.Host.Library.Log.FileLogger
                                               
                                              @@ -595,9 +613,21 @@
                                              Get an item from a map ignoring case
                                              +
                                              getCipher() - Method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              +
                                              +
                                              Gets the Client's Cipher
                                              +
                                              +
                                              getCipher(String) - Static method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              +
                                              +
                                              Gets a Cipher by Handle
                                              +
                                              +
                                              getCiphers() - Static method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              +
                                              +
                                              Gets the Ciphers
                                              +
                                              getClient() - Method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              -
                                              Gets the Server Socket
                                              +
                                              Gets the Client Socket
                                              getColorChar() - Static method in enum net.ME1312.SubServers.Host.Library.TextColor
                                               
                                              @@ -677,10 +707,6 @@
                                              Gets the edit to be made
                                              -
                                              getEncryption() - Method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              -
                                              -
                                              Gets the Connection's Encryption method
                                              -
                                              getExitCode() - Method in class net.ME1312.SubServers.Host.API.Event.SubDisableEvent
                                              Get the Exit Code
                                              @@ -851,6 +877,12 @@
                                              Gets the name of the Server
                                              +
                                              getName() - Method in interface net.ME1312.SubServers.Host.Network.Cipher
                                              +
                                              +
                                              Get the name of this Cipher
                                              +
                                              +
                                              getName() - Method in class net.ME1312.SubServers.Host.Network.Ciphers.AES
                                              +
                                               
                                              getName() - Method in class net.ME1312.SubServers.Host.Network.SubDataClient
                                              Gets the Assigned Host Name
                                              @@ -1209,11 +1241,11 @@
                                               
                                              info - Variable in class net.ME1312.SubServers.Host.Library.Log.Logger
                                               
                                              -
                                              InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Host.Network.AES.InvalidAESStreamException
                                              +
                                              InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidAESStreamException
                                               
                                              -
                                              InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Host.Network.AES.InvalidAESStreamException
                                              +
                                              InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidAESStreamException
                                               
                                              -
                                              InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Host.Network.AES.InvalidPasswordException
                                              +
                                              InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidPasswordException
                                               
                                              InvalidServerException - Exception in net.ME1312.SubServers.Host.Library.Exception
                                              @@ -1443,6 +1475,8 @@
                                               
                                              net.ME1312.SubServers.Host.Network - package net.ME1312.SubServers.Host.Network
                                               
                                              +
                                              net.ME1312.SubServers.Host.Network.Ciphers - package net.ME1312.SubServers.Host.Network.Ciphers
                                              +
                                               
                                              net.ME1312.SubServers.Host.Network.Packet - package net.ME1312.SubServers.Host.Network.Packet
                                               
                                              NORMAL - Static variable in class net.ME1312.SubServers.Host.Library.Event.EventOrder
                                              @@ -1991,7 +2025,7 @@
                                              stripColor(String) - Static method in enum net.ME1312.SubServers.Host.Library.TextColor
                                               
                                              -
                                              StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Host.Network.AES.StrongEncryptionNotAvailableException
                                              +
                                              StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Host.Network.Ciphers.AES.StrongEncryptionNotAvailableException
                                               
                                              SubAddHostEvent - Class in net.ME1312.SubServers.Host.API.Event
                                              @@ -2051,12 +2085,10 @@
                                              SubData Direct Client Class
                                              -
                                              SubDataClient(ExHost, String, InetAddress, int, SubDataClient.Encryption) - Constructor for class net.ME1312.SubServers.Host.Network.SubDataClient
                                              +
                                              SubDataClient(ExHost, String, InetAddress, int, Cipher) - Constructor for class net.ME1312.SubServers.Host.Network.SubDataClient
                                              SubServers Client Instance
                                              -
                                              SubDataClient.Encryption - Enum in net.ME1312.SubServers.Host.Network
                                              -
                                               
                                              SubDisableEvent - Class in net.ME1312.SubServers.Host.API.Event
                                              SubServers.Host Disable Event Class
                                              @@ -2316,10 +2348,6 @@
                                              Returns the enum constant of this type with the specified name.
                                              -
                                              valueOf(String) - Static method in enum net.ME1312.SubServers.Host.Network.SubDataClient.Encryption
                                              -
                                              -
                                              Returns the enum constant of this type with the specified name.
                                              -
                                              values() - Static method in enum net.ME1312.SubServers.Host.Executable.SubCreator.ServerType
                                              Returns an array containing the constants of this enum type, in @@ -2335,11 +2363,6 @@ the order they are declared.
                                              Returns an array containing the constants of this enum type, in the order they are declared.
                                              -
                                              values() - Static method in enum net.ME1312.SubServers.Host.Network.SubDataClient.Encryption
                                              -
                                              -
                                              Returns an array containing the constants of this enum type, in -the order they are declared.
                                              -
                                              version - Variable in class net.ME1312.SubServers.Host.ExHost
                                               
                                              Version - Class in net.ME1312.SubServers.Host.Library.Version
                                              diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.html deleted file mode 100644 index 05c817bf..00000000 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/AES.html +++ /dev/null @@ -1,468 +0,0 @@ - - - - - -AES (SubServers.Host) - - - - - - - -
                                              - - -
                                              Skip navigation links
                                              - - - - -
                                              -
                                              - - - -
                                              - -
                                              -
                                              - - -
                                              - - -
                                              - - -
                                              -
                                              net.ME1312.SubServers.Host.Network
                                              -

                                              Class AES

                                              -
                                              -
                                              -
                                                -
                                              • java.lang.Object
                                                • -
                                              • -
                                                  -
                                                • net.ME1312.SubServers.Host.Network.AES
                                                  • -
                                                -
                                                • -
                                              -
                                              - -
                                              -
                                              -
                                                -
                                              • - -
                                                  -
                                                • - - -

                                                  Nested Class Summary

                                                  - - - - - - - - - - - - - - - - - - - - - - -
                                                  Nested Classes 
                                                  Modifier and TypeClass and Description
                                                  static class AES.InvalidAESStreamException -
                                                  Thrown if an attempt is made to decrypt an invalid AES stream.
                                                  -
                                                  static class AES.InvalidKeyLengthException -
                                                  Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                  -
                                                  static class AES.InvalidPasswordException -
                                                  Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                  -
                                                  static class AES.StrongEncryptionNotAvailableException -
                                                  Thrown if 192- or 256-bit AES encryption or decryption is attempted, - but not available on the particular Java platform.
                                                  -
                                                  -
                                                  • -
                                                - -
                                                  -
                                                • - - -

                                                  Constructor Summary

                                                  - - - - - - - - -
                                                  Constructors 
                                                  Constructor and Description
                                                  AES() 
                                                  -
                                                  • -
                                                - - -
                                                • -
                                              -
                                              -
                                              -
                                                -
                                              • - -
                                                  -
                                                • - - -

                                                  Constructor Detail

                                                  - - - -
                                                    -
                                                  • -

                                                    AES

                                                    -
                                                    public AES()
                                                    -
                                                    • -
                                                  -
                                                  • -
                                                - -
                                                  -
                                                • - - -

                                                  Method Detail

                                                  - - - -
                                                    -
                                                  • -

                                                    encrypt

                                                    -
                                                    public static void encrypt(int keyLength,
-                           java.lang.String password,
-                           java.io.InputStream input,
-                           java.io.OutputStream output)
-                    throws AES.InvalidKeyLengthException,
-                           AES.StrongEncryptionNotAvailableException,
-                           java.io.IOException
                                                    -
                                                    Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
                                                    -
                                                      -
                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                      • -
                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                      • -
                                                    • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
                                                      • -
                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                      • -
                                                    -
                                                    -
                                                    Parameters:
                                                    -
                                                    keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                    -
                                                    password - password to use for encryption
                                                    -
                                                    input - an arbitrary byte stream to encrypt
                                                    -
                                                    output - stream to which encrypted data will be written
                                                    -
                                                    Throws:
                                                    -
                                                    AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                    -
                                                    AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
                                                    -
                                                    java.io.IOException
                                                    -
                                                    -
                                                    • -
                                                  - - - -
                                                    -
                                                  • -

                                                    encrypt

                                                    -
                                                    public static byte[] encrypt(int keyLength,
-                             java.lang.String password,
-                             java.lang.String input)
-                      throws java.io.IOException,
-                             AES.StrongEncryptionNotAvailableException,
-                             AES.InvalidKeyLengthException
                                                    -
                                                    Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
                                                    -
                                                      -
                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                      • -
                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                      • -
                                                    • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
                                                      • -
                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                      • -
                                                    -
                                                    -
                                                    Parameters:
                                                    -
                                                    keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                    -
                                                    password - password to use for encryption
                                                    -
                                                    input - an arbitrary string to encrypt
                                                    -
                                                    Returns:
                                                    -
                                                    string containing the encrypted data
                                                    -
                                                    Throws:
                                                    -
                                                    AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                    -
                                                    AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
                                                    -
                                                    java.io.IOException
                                                    -
                                                    -
                                                    • -
                                                  - - - - - - - - -
                                                  • -
                                                -
                                                • -
                                              -
                                              -
                                              - - -
                                              - - -
                                              Skip navigation links
                                              - - - - -
                                              -
                                              - - - -
                                              - -
                                              -
                                              - - -
                                              - - -
                                              - - - diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Cipher.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Cipher.html new file mode 100644 index 00000000..82b309a1 --- /dev/null +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Cipher.html @@ -0,0 +1,286 @@ + + + + + +Cipher (SubServers.Host) + + + + + + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              +
                                              +
                                                +
                                              • Summary: 
                                                • +
                                              • Nested | 
                                                • +
                                              • Field | 
                                                • +
                                              • Constr | 
                                                • +
                                              • Method
                                                • +
                                              +
                                                +
                                              • Detail: 
                                                • +
                                              • Field | 
                                                • +
                                              • Constr | 
                                                • +
                                              • Method
                                                • +
                                              +
                                              + + +
                                              + + +
                                              +
                                              net.ME1312.SubServers.Host.Network
                                              +

                                              Interface Cipher

                                              +
                                              +
                                              +
                                              +
                                                +
                                              • +
                                                +
                                                All Known Implementing Classes:
                                                +
                                                AES
                                                +
                                                +
                                                +
                                                +
                                                public interface Cipher
                                                +
                                                SubData Cipher Layout Class
                                                +
                                                • +
                                              +
                                              +
                                              +
                                                +
                                              • + +
                                                  +
                                                • + + +

                                                  Method Summary

                                                  + + + + + + + + + + + + + + + + + + +
                                                  All Methods Instance Methods Abstract Methods 
                                                  Modifier and TypeMethod and Description
                                                  org.json.JSONObjectdecrypt(java.lang.String key, + byte[] data) +
                                                  Decrypt Encrypted JSON Data
                                                  +
                                                  byte[]encrypt(java.lang.String key, + org.json.JSONObject data) +
                                                  Encrypt JSON Data
                                                  +
                                                  java.lang.StringgetName() +
                                                  Get the name of this Cipher
                                                  +
                                                  +
                                                  • +
                                                +
                                                • +
                                              +
                                              +
                                              +
                                                +
                                              • + +
                                                  +
                                                • + + +

                                                  Method Detail

                                                  + + + +
                                                    +
                                                  • +

                                                    getName

                                                    +
                                                    java.lang.String getName()
                                                    +
                                                    Get the name of this Cipher
                                                    +
                                                    +
                                                    Returns:
                                                    +
                                                    Cipher Name
                                                    +
                                                    +
                                                    • +
                                                  + + + +
                                                    +
                                                  • +

                                                    encrypt

                                                    +
                                                    byte[] encrypt(java.lang.String key,
+               org.json.JSONObject data)
+        throws java.lang.Exception
                                                    +
                                                    Encrypt JSON Data
                                                    +
                                                    +
                                                    Parameters:
                                                    +
                                                    key - Key to Encrypt Data with
                                                    +
                                                    data - Data to Encrypt
                                                    +
                                                    Returns:
                                                    +
                                                    Encrypted Data Array
                                                    +
                                                    Throws:
                                                    +
                                                    java.lang.Exception
                                                    +
                                                    +
                                                    • +
                                                  + + + +
                                                    +
                                                  • +

                                                    decrypt

                                                    +
                                                    org.json.JSONObject decrypt(java.lang.String key,
+                            byte[] data)
+                     throws java.lang.Exception
                                                    +
                                                    Decrypt Encrypted JSON Data
                                                    +
                                                    +
                                                    Parameters:
                                                    +
                                                    key - Key to Decrypt Data with
                                                    +
                                                    data - Encrypted Data Array
                                                    +
                                                    Returns:
                                                    +
                                                    JSON Data
                                                    +
                                                    Throws:
                                                    +
                                                    java.lang.Exception
                                                    +
                                                    +
                                                    • +
                                                  +
                                                  • +
                                                +
                                                • +
                                              +
                                              +
                                              + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              +
                                              +
                                                +
                                              • Summary: 
                                                • +
                                              • Nested | 
                                                • +
                                              • Field | 
                                                • +
                                              • Constr | 
                                                • +
                                              • Method
                                                • +
                                              +
                                                +
                                              • Detail: 
                                                • +
                                              • Field | 
                                                • +
                                              • Constr | 
                                                • +
                                              • Method
                                                • +
                                              +
                                              + + +
                                              + + + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/AES.InvalidAESStreamException.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/AES.InvalidAESStreamException.html similarity index 79% rename from Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/AES.InvalidAESStreamException.html rename to Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/AES.InvalidAESStreamException.html index c816f92f..784fcc58 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/AES.InvalidAESStreamException.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/AES.InvalidAESStreamException.html @@ -3,7 +3,7 @@ -AES.InvalidAESStreamException (SubServers.Client.Bukkit) +AES.InvalidAESStreamException (SubServers.Host) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ + + + + + + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              +
                                              + + +
                                              + + +
                                              + + +
                                              +
                                              net.ME1312.SubServers.Host.Network.Ciphers
                                              +

                                              Class AES

                                              +
                                              +
                                              +
                                                +
                                              • java.lang.Object
                                                • +
                                              • +
                                                  +
                                                • net.ME1312.SubServers.Host.Network.Ciphers.AES
                                                  • +
                                                +
                                                • +
                                              +
                                              + +
                                              +
                                              +
                                                +
                                              • + +
                                                  +
                                                • + + +

                                                  Nested Class Summary

                                                  + + + + + + + + + + + + + + + + + + + + + + +
                                                  Nested Classes 
                                                  Modifier and TypeClass and Description
                                                  static class AES.InvalidAESStreamException +
                                                  Thrown if an attempt is made to decrypt an invalid AES stream.
                                                  +
                                                  static class AES.InvalidKeyLengthException +
                                                  Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                  +
                                                  static class AES.InvalidPasswordException +
                                                  Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                  +
                                                  static class AES.StrongEncryptionNotAvailableException +
                                                  Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                                  +
                                                  +
                                                  • +
                                                + +
                                                  +
                                                • + + +

                                                  Constructor Summary

                                                  + + + + + + + + +
                                                  Constructors 
                                                  Constructor and Description
                                                  AES(int keyLength) +
                                                  Constructor for use as a SubData Cipher
                                                  +
                                                  +
                                                  • +
                                                + + +
                                                • +
                                              +
                                              +
                                              +
                                                +
                                              • + +
                                                  +
                                                • + + +

                                                  Constructor Detail

                                                  + + + +
                                                    +
                                                  • +

                                                    AES

                                                    +
                                                    public AES(int keyLength)
                                                    +
                                                    Constructor for use as a SubData Cipher
                                                    +
                                                    • +
                                                  +
                                                  • +
                                                + +
                                                  +
                                                • + + +

                                                  Method Detail

                                                  + + + +
                                                    +
                                                  • +

                                                    encrypt

                                                    +
                                                    public static void encrypt(int keyLength,
+                           java.lang.String password,
+                           java.io.InputStream input,
+                           java.io.OutputStream output)
+                    throws AES.InvalidKeyLengthException,
+                           AES.StrongEncryptionNotAvailableException,
+                           java.io.IOException
                                                    +
                                                    Encrypts a stream of data. The encrypted stream consists of a header + followed by the raw AES data. The header is broken down as follows:
                                                    +
                                                      +
                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                      • +
                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                      • +
                                                    • authentication key (derived from password and salt, used to + check validity of password upon decryption) (8 bytes)
                                                      • +
                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                      • +
                                                    +
                                                    +
                                                    Parameters:
                                                    +
                                                    keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                    +
                                                    password - password to use for encryption
                                                    +
                                                    input - an arbitrary byte stream to encrypt
                                                    +
                                                    output - stream to which encrypted data will be written
                                                    +
                                                    Throws:
                                                    +
                                                    AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                    +
                                                    AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction + policy files do not allow 192- or 256-bit encryption
                                                    +
                                                    java.io.IOException
                                                    +
                                                    +
                                                    • +
                                                  + + + +
                                                    +
                                                  • +

                                                    encrypt

                                                    +
                                                    public byte[] encrypt(java.lang.String key,
+                      org.json.JSONObject data)
+               throws java.lang.Exception
                                                    +
                                                    This method calls to encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                    +
                                                    +
                                                    Specified by:
                                                    +
                                                    encrypt in interface Cipher
                                                    +
                                                    Parameters:
                                                    +
                                                    key - Key to Encrypt Data with
                                                    +
                                                    data - Data to Encrypt
                                                    +
                                                    Returns:
                                                    +
                                                    Encrypted Data Array
                                                    +
                                                    Throws:
                                                    +
                                                    java.lang.Exception
                                                    +
                                                    +
                                                    • +
                                                  + + + +
                                                    +
                                                  • +

                                                    getName

                                                    +
                                                    public java.lang.String getName()
                                                    +
                                                    Description copied from interface: Cipher
                                                    +
                                                    Get the name of this Cipher
                                                    +
                                                    +
                                                    Specified by:
                                                    +
                                                    getName in interface Cipher
                                                    +
                                                    Returns:
                                                    +
                                                    Cipher Name
                                                    +
                                                    +
                                                    • +
                                                  + + + + + + + +
                                                    +
                                                  • +

                                                    decrypt

                                                    +
                                                    public org.json.JSONObject decrypt(java.lang.String key,
+                                   byte[] data)
+                            throws java.lang.Exception
                                                    +
                                                    This method calls to decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                    +
                                                    +
                                                    Specified by:
                                                    +
                                                    decrypt in interface Cipher
                                                    +
                                                    Parameters:
                                                    +
                                                    key - Key to Decrypt Data with
                                                    +
                                                    data - Encrypted Data Array
                                                    +
                                                    Returns:
                                                    +
                                                    JSON Data
                                                    +
                                                    Throws:
                                                    +
                                                    java.lang.Exception
                                                    +
                                                    +
                                                    • +
                                                  +
                                                  • +
                                                +
                                                • +
                                              +
                                              +
                                              + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              +
                                              + + +
                                              + + +
                                              + + + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-frame.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-frame.html new file mode 100644 index 00000000..d05977e4 --- /dev/null +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-frame.html @@ -0,0 +1,26 @@ + + + + + +net.ME1312.SubServers.Host.Network.Ciphers (SubServers.Host) + + + + +

                                              net.ME1312.SubServers.Host.Network.Ciphers

                                              +
                                              +

                                              Classes

                                              + +

                                              Exceptions

                                              + +
                                              + + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-summary.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-summary.html new file mode 100644 index 00000000..8932fc1a --- /dev/null +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-summary.html @@ -0,0 +1,177 @@ + + + + + +net.ME1312.SubServers.Host.Network.Ciphers (SubServers.Host) + + + + + + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              + + +
                                              + +
                                              +

                                              Package net.ME1312.SubServers.Host.Network.Ciphers

                                              +
                                              +
                                              +
                                                +
                                              • + + + + + + + + + + + + +
                                                Class Summary 
                                                ClassDescription
                                                AES +
                                                A class to perform password-based AES encryption and decryption in CBC mode.
                                                +
                                                +
                                                • +
                                              • + + + + + + + + + + + + + + + + + + + + + + + + +
                                                Exception Summary 
                                                ExceptionDescription
                                                AES.InvalidAESStreamException +
                                                Thrown if an attempt is made to decrypt an invalid AES stream.
                                                +
                                                AES.InvalidKeyLengthException +
                                                Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                +
                                                AES.InvalidPasswordException +
                                                Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                +
                                                AES.StrongEncryptionNotAvailableException +
                                                Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                                +
                                                +
                                                • +
                                              +
                                              + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              + + +
                                              + + + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-tree.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-tree.html new file mode 100644 index 00000000..9cbe1641 --- /dev/null +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Ciphers/package-tree.html @@ -0,0 +1,146 @@ + + + + + +net.ME1312.SubServers.Host.Network.Ciphers Class Hierarchy (SubServers.Host) + + + + + + + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              + + +
                                              + +
                                              +

                                              Hierarchy For Package net.ME1312.SubServers.Host.Network.Ciphers

                                              +Package Hierarchies: + +
                                              +
                                              +

                                              Class Hierarchy

                                              + +
                                              + +
                                              + + +
                                              Skip navigation links
                                              + + + + +
                                              +
                                              + + + +
                                              + +
                                              + + +
                                              + + + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-summary.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-summary.html index 9a387d26..d37002ed 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-summary.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-summary.html @@ -41,7 +41,7 @@
                                              @@ -260,7 +260,7 @@
                                              diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-tree.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-tree.html index e14e4134..3f10d182 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-tree.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/package-tree.html @@ -41,7 +41,7 @@
                                              @@ -139,7 +139,7 @@
                                              diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/PacketIn.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/PacketIn.html index fd68e668..b1670af8 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/PacketIn.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/PacketIn.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
                                              @@ -208,7 +208,7 @@ var activeTableTab = "activeTableTab";
                                              diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.Encryption.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.Encryption.html deleted file mode 100644 index 8d57ef2b..00000000 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.Encryption.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - -SubDataClient.Encryption (SubServers.Host) - - - - - - - -
                                              - - -
                                              Skip navigation links
                                              - - - - -
                                              -
                                              - - - -
                                              - -
                                              -
                                              - - -
                                              - - -
                                              - - -
                                              -
                                              net.ME1312.SubServers.Host.Network
                                              -

                                              Enum SubDataClient.Encryption

                                              -
                                              -
                                              -
                                                -
                                              • java.lang.Object
                                                • -
                                              • - -
                                                • -
                                              -
                                              - -
                                              -
                                              -
                                                -
                                              • - - - -
                                                  -
                                                • - - -

                                                  Method Summary

                                                  - - - - - - - - - - - - - - -
                                                  All Methods Static Methods Concrete Methods 
                                                  Modifier and TypeMethod and Description
                                                  static SubDataClient.EncryptionvalueOf(java.lang.String name) -
                                                  Returns the enum constant of this type with the specified name.
                                                  -
                                                  static SubDataClient.Encryption[]values() -
                                                  Returns an array containing the constants of this enum type, in -the order they are declared.
                                                  -
                                                  -
                                                    -
                                                  • - - -

                                                    Methods inherited from class java.lang.Enum

                                                    -compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                                                    • -
                                                  -
                                                    -
                                                  • - - -

                                                    Methods inherited from class java.lang.Object

                                                    -getClass, notify, notifyAll, wait, wait, wait
                                                    • -
                                                  -
                                                  • -
                                                -
                                                • -
                                              -
                                              -
                                              -
                                                -
                                              • - - - -
                                                  -
                                                • - - -

                                                  Method Detail

                                                  - - - -
                                                    -
                                                  • -

                                                    values

                                                    -
                                                    public static SubDataClient.Encryption[] values()
                                                    -
                                                    Returns an array containing the constants of this enum type, in -the order they are declared. This method may be used to iterate -over the constants as follows: -
                                                    -for (SubDataClient.Encryption c : SubDataClient.Encryption.values())
-    System.out.println(c);
-
                                                    -
                                                    -
                                                    Returns:
                                                    -
                                                    an array containing the constants of this enum type, in the order they are declared
                                                    -
                                                    -
                                                    • -
                                                  - - - -
                                                    -
                                                  • -

                                                    valueOf

                                                    -
                                                    public static SubDataClient.Encryption valueOf(java.lang.String name)
                                                    -
                                                    Returns the enum constant of this type with the specified name. -The string must match exactly an identifier used to declare an -enum constant in this type. (Extraneous whitespace characters are -not permitted.)
                                                    -
                                                    -
                                                    Parameters:
                                                    -
                                                    name - the name of the enum constant to be returned.
                                                    -
                                                    Returns:
                                                    -
                                                    the enum constant with the specified name
                                                    -
                                                    Throws:
                                                    -
                                                    java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                                                    -
                                                    java.lang.NullPointerException - if the argument is null
                                                    -
                                                    -
                                                    • -
                                                  -
                                                  • -
                                                -
                                                • -
                                              -
                                              -
                                              - - -
                                              - - -
                                              Skip navigation links
                                              - - - - -
                                              -
                                              - - - -
                                              - -
                                              -
                                              - - -
                                              - - -
                                              - - - diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.html index d57c40ab..30dcf4a8 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/SubDataClient.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":9,"i8":9,"i9":10,"i10":9,"i11":9}; +var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":9,"i7":10,"i8":10,"i9":9,"i10":9,"i11":9,"i12":10,"i13":9,"i14":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
                                              • Frames
                                                • @@ -72,7 +72,7 @@ var activeTableTab = "activeTableTab";
                                                • Summary: 
                                                  • -
                                                • Nested | 
                                                  • +
                                                • Nested | 
                                                • Field | 
                                                • Constr | 
                                                • Method
                                                  • @@ -116,25 +116,6 @@ extends java.lang.Object
                                                  • - -
                                                      -
                                                    • - - -

                                                      Nested Class Summary

                                                      - - - - - - - - - - -
                                                      Nested Classes 
                                                      Modifier and TypeClass and Description
                                                      static class SubDataClient.Encryption 
                                                      -
                                                      • -
                                                    • @@ -147,11 +128,11 @@ extends java.lang.Object Constructor and Description -SubDataClient(ExHost host, +SubDataClient(ExHost host, java.lang.String name, java.net.InetAddress address, int port, - SubDataClient.Encryption encryption) + Cipher cipher)
                                                      SubServers Client Instance
                                                      @@ -171,75 +152,94 @@ extends java.lang.Object Method and Description +static void +addCipher(java.lang.String handle, + Cipher cipher) +
                                                      Add a Cipher for use by SubData
                                                      + + + void broadcastPacket(PacketOut packet)
                                                      Broadcast packet to all Clients
                                                      - + void destroy(int reconnect)
                                                      Drops All Connections and Stops the SubData Listener
                                                      - + void forwardPacket(PacketOut packet, java.lang.String location)
                                                      Forward Packet to Server
                                                      - -java.net.Socket -getClient() -
                                                      Gets the Server Socket
                                                      - - -SubDataClient.Encryption -getEncryption() -
                                                      Gets the Connection's Encryption method
                                                      +Cipher +getCipher() +
                                                      Gets the Client's Cipher
                                                      +static Cipher +getCipher(java.lang.String handle) +
                                                      Gets a Cipher by Handle
                                                      + + + +static java.util.Map<java.lang.String,Cipher> +getCiphers() +
                                                      Gets the Ciphers
                                                      + + + +java.net.Socket +getClient() +
                                                      Gets the Client Socket
                                                      + + + java.lang.String getName()
                                                      Gets the Assigned Host Name
                                                      - + static java.util.List<? extends PacketIn> getPacket(java.lang.String handle)
                                                      Grab PacketIn Instances via handle
                                                      - + static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle)
                                                      Register PacketOut to the Network
                                                      - + static void registerPacket(PacketIn packet, java.lang.String handle)
                                                      Register PacketIn to the Network
                                                      - + void sendPacket(PacketOut packet)
                                                      Send Packet to Client
                                                      - + static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
                                                      Unregister PacketOut to the Network
                                                      - + static void unregisterPacket(PacketIn packet)
                                                      Unregister PacketIn from the Network
                                                      @@ -267,7 +267,7 @@ extends java.lang.Object

                                                      Constructor Detail

                                                      - +
                                                        @@ -277,7 +277,7 @@ extends java.lang.Object java.lang.String name, java.net.InetAddress address, int port, - SubDataClient.Encryption encryption) + Cipher cipher) throws java.io.IOException
                                                        SubServers Client Instance
                                                        @@ -286,7 +286,7 @@ extends java.lang.Object
                                                        name - Name of Host
                                                        address - Address
                                                        port - Port
                                                        -
                                                        encryption - Encryption Type
                                                        +
                                                        cipher - Cipher
                                                        Throws:
                                                        java.io.IOException
                                                        @@ -321,24 +321,70 @@ extends java.lang.Object

                                                      • getClient

                                                        public java.net.Socket getClient()
                                                        -
                                                        Gets the Server Socket
                                                        +
                                                        Gets the Client Socket
                                                        Returns:
                                                        -
                                                        Server Socket
                                                        +
                                                        Client Socket
                                                      - +
                                                      • -

                                                        getEncryption

                                                        -
                                                        public SubDataClient.Encryption getEncryption()
                                                        -
                                                        Gets the Connection's Encryption method
                                                        +

                                                        addCipher

                                                        +
                                                        public static void addCipher(java.lang.String handle,
+                             Cipher cipher)
                                                        +
                                                        Add a Cipher for use by SubData
                                                        +
                                                        +
                                                        Parameters:
                                                        +
                                                        cipher - Cipher to Add
                                                        +
                                                        handle - Handle to Bind
                                                        +
                                                        +
                                                        • +
                                                      + + + +
                                                        +
                                                      • +

                                                        getCiphers

                                                        +
                                                        public static java.util.Map<java.lang.String,Cipher> getCiphers()
                                                        +
                                                        Gets the Ciphers
                                                        Returns:
                                                        -
                                                        Encryption method
                                                        +
                                                        Cipher Map
                                                        +
                                                        +
                                                        • +
                                                      + + + +
                                                        +
                                                      • +

                                                        getCipher

                                                        +
                                                        public Cipher getCipher()
                                                        +
                                                        Gets the Client's Cipher
                                                        +
                                                        +
                                                        Returns:
                                                        +
                                                        Cipher
                                                        +
                                                        +
                                                        • +
                                                      + + + +
                                                        +
                                                      • +

                                                        getCipher

                                                        +
                                                        public static Cipher getCipher(java.lang.String handle)
                                                        +
                                                        Gets a Cipher by Handle
                                                        +
                                                        +
                                                        Parameters:
                                                        +
                                                        handle - Handle
                                                        +
                                                        Returns:
                                                        +
                                                        Cipher
                                                      @@ -505,7 +551,7 @@ extends java.lang.Object
                                                      • Frames
                                                        • @@ -529,7 +575,7 @@ extends java.lang.Object
                                                        • Summary: 
                                                          • -
                                                        • Nested | 
                                                          • +
                                                        • Nested | 
                                                        • Field | 
                                                        • Constr | 
                                                        • Method
                                                          • diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-frame.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-frame.html index c3a99c35..7b8c9b00 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-frame.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-frame.html @@ -12,25 +12,14 @@

                                                          Interfaces

                                                          Classes

                                                          -

                                                          Enums

                                                          - -

                                                          Exceptions

                                                          -
                                                          diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-summary.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-summary.html index c132b4c6..33ed97a9 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-summary.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/package-summary.html @@ -42,7 +42,7 @@
                                                          @@ -192,7 +141,7 @@
                                                          @@ -90,7 +91,7 @@
                                                          • java.lang.Object
                                                              -
                                                            • net.ME1312.SubServers.Host.Network.AES
                                                              • +
                                                            • net.ME1312.SubServers.Host.Network.Ciphers.AES (implements net.ME1312.SubServers.Host.Network.Cipher)
                                                            • net.ME1312.SubServers.Host.API.Command
                                                            • net.ME1312.SubServers.Host.Library.Container<V>
                                                                @@ -175,10 +176,10 @@
                                                                • java.lang.Exception
                                                                    -
                                                                  • net.ME1312.SubServers.Host.Network.AES.InvalidAESStreamException
                                                                    • -
                                                                  • net.ME1312.SubServers.Host.Network.AES.InvalidKeyLengthException
                                                                    • -
                                                                  • net.ME1312.SubServers.Host.Network.AES.InvalidPasswordException
                                                                    • -
                                                                  • net.ME1312.SubServers.Host.Network.AES.StrongEncryptionNotAvailableException
                                                                    • +
                                                                  • net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidAESStreamException
                                                                    • +
                                                                  • net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidKeyLengthException
                                                                    • +
                                                                  • net.ME1312.SubServers.Host.Network.Ciphers.AES.InvalidPasswordException
                                                                    • +
                                                                  • net.ME1312.SubServers.Host.Network.Ciphers.AES.StrongEncryptionNotAvailableException
                                                                  • java.lang.ReflectiveOperationException
                                                                    • java.lang.reflect.InvocationTargetException @@ -217,6 +218,7 @@

                                                                      Interface Hierarchy

                                                                      • net.ME1312.SubServers.Host.Library.Event.Cancellable
                                                                        • +
                                                                      • net.ME1312.SubServers.Host.Network.Cipher
                                                                      • net.ME1312.SubServers.Host.Library.ExtraDataHandler
                                                                      • net.ME1312.SubServers.Host.Library.JSONCallback
                                                                      • net.ME1312.SubServers.Host.Library.Event.Listener
                                                                        • @@ -238,7 +240,6 @@ diff --git a/Javadoc/SubServers.Host/package-list b/Javadoc/SubServers.Host/package-list index 173fe269..c28b3593 100644 --- a/Javadoc/SubServers.Host/package-list +++ b/Javadoc/SubServers.Host/package-list @@ -9,4 +9,5 @@ net.ME1312.SubServers.Host.Library.Exception net.ME1312.SubServers.Host.Library.Log net.ME1312.SubServers.Host.Library.Version net.ME1312.SubServers.Host.Network +net.ME1312.SubServers.Host.Network.Ciphers net.ME1312.SubServers.Host.Network.Packet diff --git a/Javadoc/SubServers.Host/serialized-form.html b/Javadoc/SubServers.Host/serialized-form.html index c31478cb..2e3c0143 100644 --- a/Javadoc/SubServers.Host/serialized-form.html +++ b/Javadoc/SubServers.Host/serialized-form.html @@ -168,27 +168,27 @@
                                                                    • -

                                                                      Package net.ME1312.SubServers.Host.Network

                                                                      +

                                                                      Package net.ME1312.SubServers.Host.Network.Ciphers

                                                                      • diff --git a/Javadoc/SubServers.Sync.jar b/Javadoc/SubServers.Sync.jar index 670f4f8a..744dc164 100644 Binary files a/Javadoc/SubServers.Sync.jar and b/Javadoc/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Sync/allclasses-frame.html b/Javadoc/SubServers.Sync/allclasses-frame.html index 0b7b7b67..18742d3d 100644 --- a/Javadoc/SubServers.Sync/allclasses-frame.html +++ b/Javadoc/SubServers.Sync/allclasses-frame.html @@ -11,11 +11,12 @@

                                                                      All Classes

                                                                        -
                                                                      • AES
                                                                        • -
                                                                      • AES.InvalidAESStreamException
                                                                        • -
                                                                      • AES.InvalidKeyLengthException
                                                                        • -
                                                                      • AES.InvalidPasswordException
                                                                        • -
                                                                      • AES.StrongEncryptionNotAvailableException
                                                                        • +
                                                                      • AES
                                                                        • +
                                                                      • AES.InvalidAESStreamException
                                                                        • +
                                                                      • AES.InvalidKeyLengthException
                                                                        • +
                                                                      • AES.InvalidPasswordException
                                                                        • +
                                                                      • AES.StrongEncryptionNotAvailableException
                                                                        • +
                                                                      • Cipher
                                                                      • CommandX
                                                                      • CommandX
                                                                      • Container
                                                                        • @@ -50,7 +51,6 @@
                                                                      • SubCommand.BungeeServer
                                                                      • SubCreateEvent
                                                                      • SubDataClient
                                                                        • -
                                                                      • SubDataClient.Encryption
                                                                      • SubEditServerEvent
                                                                      • SubEvent
                                                                      • SubNetworkConnectEvent
                                                                        • diff --git a/Javadoc/SubServers.Sync/allclasses-noframe.html b/Javadoc/SubServers.Sync/allclasses-noframe.html index 4f2eff52..96fafe36 100644 --- a/Javadoc/SubServers.Sync/allclasses-noframe.html +++ b/Javadoc/SubServers.Sync/allclasses-noframe.html @@ -11,11 +11,12 @@

                                                                        All Classes

                                                                          -
                                                                        • AES
                                                                          • -
                                                                        • AES.InvalidAESStreamException
                                                                          • -
                                                                        • AES.InvalidKeyLengthException
                                                                          • -
                                                                        • AES.InvalidPasswordException
                                                                          • -
                                                                        • AES.StrongEncryptionNotAvailableException
                                                                          • +
                                                                        • AES
                                                                          • +
                                                                        • AES.InvalidAESStreamException
                                                                          • +
                                                                        • AES.InvalidKeyLengthException
                                                                          • +
                                                                        • AES.InvalidPasswordException
                                                                          • +
                                                                        • AES.StrongEncryptionNotAvailableException
                                                                          • +
                                                                        • Cipher
                                                                        • CommandX
                                                                        • CommandX
                                                                        • Container
                                                                          • @@ -50,7 +51,6 @@
                                                                        • SubCommand.BungeeServer
                                                                        • SubCreateEvent
                                                                        • SubDataClient
                                                                          • -
                                                                        • SubDataClient.Encryption
                                                                        • SubEditServerEvent
                                                                        • SubEvent
                                                                        • SubNetworkConnectEvent
                                                                          • diff --git a/Javadoc/SubServers.Sync/index-all.html b/Javadoc/SubServers.Sync/index-all.html index c0bdc23e..3677b335 100644 --- a/Javadoc/SubServers.Sync/index-all.html +++ b/Javadoc/SubServers.Sync/index-all.html @@ -74,6 +74,10 @@
                                                                          add(SubAddServerEvent) - Method in class net.ME1312.SubServers.Sync.SubPlugin
                                                                           
                                                                          +
                                                                          addCipher(String, Cipher) - Static method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          +
                                                                          +
                                                                          Add a Cipher for use by SubData
                                                                          +
                                                                          addExtra(String, Object) - Method in interface net.ME1312.SubServers.Sync.Library.ExtraDataHandler
                                                                          Add an extra value to this Server
                                                                          @@ -82,25 +86,27 @@
                                                                          Adds a SubAPI Listener
                                                                          -
                                                                          AES - Class in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          AES - Class in net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          A class to perform password-based AES encryption and decryption in CBC mode.
                                                                          -
                                                                          AES() - Constructor for class net.ME1312.SubServers.Sync.Network.AES
                                                                          -
                                                                           
                                                                          -
                                                                          AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          AES(int) - Constructor for class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          +
                                                                          +
                                                                          Constructor for use as a SubData Cipher
                                                                          +
                                                                          +
                                                                          AES.InvalidAESStreamException - Exception in net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          Thrown if an attempt is made to decrypt an invalid AES stream.
                                                                          -
                                                                          AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          AES.InvalidKeyLengthException - Exception in net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                                          -
                                                                          AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          AES.InvalidPasswordException - Exception in net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                                          -
                                                                          AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          AES.StrongEncryptionNotAvailableException - Exception in net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          Thrown if 192- or 256-bit AES encryption or decryption is attempted, but not available on the particular Java platform.
                                                                          @@ -225,6 +231,10 @@
                                                                          callback(String, JSONCallback) - Static method in class net.ME1312.SubServers.Sync.Network.Packet.PacketInRunEvent
                                                                           
                                                                          +
                                                                          Cipher - Interface in net.ME1312.SubServers.Sync.Network
                                                                          +
                                                                          +
                                                                          SubData Cipher Layout Class
                                                                          +
                                                                          clear() - Method in class net.ME1312.SubServers.Sync.Library.Config.YAMLSection
                                                                          Remove all Objects from this YAML Section
                                                                          @@ -291,13 +301,17 @@

                                                                          D

                                                                          -
                                                                          decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Sync.Network.AES
                                                                          +
                                                                          decrypt(String, byte[]) - Method in interface net.ME1312.SubServers.Sync.Network.Cipher
                                                                          -
                                                                          Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                                                          +
                                                                          Decrypt Encrypted JSON Data
                                                                          -
                                                                          decrypt(String, byte[]) - Static method in class net.ME1312.SubServers.Sync.Network.AES
                                                                          +
                                                                          decrypt(String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          -
                                                                          Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                                                          +
                                                                          Decrypts a stream of data that was encrypted by AES.encrypt(int, java.lang.String, java.io.InputStream, java.io.OutputStream).
                                                                          +
                                                                          +
                                                                          decrypt(String, byte[]) - Method in class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          +
                                                                          +
                                                                          This method calls to AES.decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                                          deleteDirectory(File) - Static method in class net.ME1312.SubServers.Sync.Library.Util
                                                                          @@ -317,13 +331,17 @@
                                                                          edit(SubEditServerEvent) - Method in class net.ME1312.SubServers.Sync.SubPlugin
                                                                           
                                                                          -
                                                                          encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Sync.Network.AES
                                                                          +
                                                                          encrypt(String, JSONObject) - Method in interface net.ME1312.SubServers.Sync.Network.Cipher
                                                                          +
                                                                          +
                                                                          Encrypt JSON Data
                                                                          +
                                                                          +
                                                                          encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          Encrypts a stream of data.
                                                                          -
                                                                          encrypt(int, String, String) - Static method in class net.ME1312.SubServers.Sync.Network.AES
                                                                          +
                                                                          encrypt(String, JSONObject) - Method in class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          -
                                                                          Encrypts a stream of data.
                                                                          +
                                                                          This method calls to AES.encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                                          equals(Version) - Method in class net.ME1312.SubServers.Sync.Library.Version.Version
                                                                          @@ -475,6 +493,18 @@
                                                                          Get an item from a map ignoring case
                                                                          +
                                                                          getCipher() - Method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          +
                                                                          +
                                                                          Gets the Client's Cipher
                                                                          +
                                                                          +
                                                                          getCipher(String) - Static method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          +
                                                                          +
                                                                          Gets a Cipher by Handle
                                                                          +
                                                                          +
                                                                          getCiphers() - Static method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          +
                                                                          +
                                                                          Gets the Ciphers
                                                                          +
                                                                          getClient() - Method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          Gets the Server Socket
                                                                          @@ -527,10 +557,6 @@
                                                                          Gets the edit to be made
                                                                          -
                                                                          getEncryption() - Method in class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          -
                                                                          -
                                                                          Gets the Connection's Encryption method
                                                                          -
                                                                          getExtra(String) - Method in interface net.ME1312.SubServers.Sync.Library.ExtraDataHandler
                                                                          Get an extra value
                                                                          @@ -657,6 +683,12 @@
                                                                          Get the name the SubServer will use
                                                                          +
                                                                          getName() - Method in interface net.ME1312.SubServers.Sync.Network.Cipher
                                                                          +
                                                                          +
                                                                          Get the name of this Cipher
                                                                          +
                                                                          +
                                                                          getName() - Method in class net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                          +
                                                                           
                                                                          getName() - Method in class net.ME1312.SubServers.Sync.SubPlugin
                                                                          Further override BungeeCord's signature when patched into the same jar
                                                                          @@ -961,11 +993,11 @@
                                                                           
                                                                          IllegalPacketException(String) - Constructor for exception net.ME1312.SubServers.Sync.Library.Exception.IllegalPacketException
                                                                           
                                                                          -
                                                                          InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Sync.Network.AES.InvalidAESStreamException
                                                                          +
                                                                          InvalidAESStreamException() - Constructor for exception net.ME1312.SubServers.Sync.Network.Ciphers.AES.InvalidAESStreamException
                                                                           
                                                                          -
                                                                          InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Sync.Network.AES.InvalidAESStreamException
                                                                          +
                                                                          InvalidAESStreamException(Exception) - Constructor for exception net.ME1312.SubServers.Sync.Network.Ciphers.AES.InvalidAESStreamException
                                                                           
                                                                          -
                                                                          InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Sync.Network.AES.InvalidPasswordException
                                                                          +
                                                                          InvalidPasswordException() - Constructor for exception net.ME1312.SubServers.Sync.Network.Ciphers.AES.InvalidPasswordException
                                                                           
                                                                          isBoolean(String) - Method in class net.ME1312.SubServers.Sync.Library.Config.YAMLSection
                                                                          @@ -1137,6 +1169,8 @@
                                                                           
                                                                          net.ME1312.SubServers.Sync.Network - package net.ME1312.SubServers.Sync.Network
                                                                           
                                                                          +
                                                                          net.ME1312.SubServers.Sync.Network.Ciphers - package net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          +
                                                                           
                                                                          net.ME1312.SubServers.Sync.Network.Packet - package net.ME1312.SubServers.Sync.Network.Packet
                                                                           
                                                                          net.ME1312.SubServers.Sync.Server - package net.ME1312.SubServers.Sync.Server
                                                                          @@ -1473,7 +1507,7 @@
                                                                          Reset all changes made by startListeners
                                                                          -
                                                                          StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Sync.Network.AES.StrongEncryptionNotAvailableException
                                                                          +
                                                                          StrongEncryptionNotAvailableException(int) - Constructor for exception net.ME1312.SubServers.Sync.Network.Ciphers.AES.StrongEncryptionNotAvailableException
                                                                           
                                                                          SubAddHostEvent - Class in net.ME1312.SubServers.Sync.Event
                                                                          @@ -1519,12 +1553,10 @@
                                                                          SubData Direct Client Class
                                                                          -
                                                                          SubDataClient(SubPlugin, InetAddress, int, SubDataClient.Encryption) - Constructor for class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          +
                                                                          SubDataClient(SubPlugin, InetAddress, int, Cipher) - Constructor for class net.ME1312.SubServers.Sync.Network.SubDataClient
                                                                          SubServers Client Instance
                                                                          -
                                                                          SubDataClient.Encryption - Enum in net.ME1312.SubServers.Sync.Network
                                                                          -
                                                                           
                                                                          SubEditServerEvent - Class in net.ME1312.SubServers.Sync.Event
                                                                          Server Edit Event
                                                                          @@ -1709,15 +1741,6 @@
                                                                          Validate a Command (Override for custom)
                                                                          -
                                                                          valueOf(String) - Static method in enum net.ME1312.SubServers.Sync.Network.SubDataClient.Encryption
                                                                          -
                                                                          -
                                                                          Returns the enum constant of this type with the specified name.
                                                                          -
                                                                          -
                                                                          values() - Static method in enum net.ME1312.SubServers.Sync.Network.SubDataClient.Encryption
                                                                          -
                                                                          -
                                                                          Returns an array containing the constants of this enum type, in -the order they are declared.
                                                                          -
                                                                          Version - Class in net.ME1312.SubServers.Sync.Library.Version
                                                                          Version Class
                                                                          diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.html deleted file mode 100644 index 0850fede..00000000 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.html +++ /dev/null @@ -1,468 +0,0 @@ - - - - - -AES (SubServers.Sync) - - - - - - - -
                                                                          - - -
                                                                          Skip navigation links
                                                                          - - - - -
                                                                          -
                                                                          - - - -
                                                                          - -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          - - -
                                                                          -
                                                                          net.ME1312.SubServers.Sync.Network
                                                                          -

                                                                          Class AES

                                                                          -
                                                                          -
                                                                          -
                                                                            -
                                                                          • java.lang.Object
                                                                            • -
                                                                          • -
                                                                              -
                                                                            • net.ME1312.SubServers.Sync.Network.AES
                                                                              • -
                                                                            -
                                                                            • -
                                                                          -
                                                                          - -
                                                                          -
                                                                          -
                                                                            -
                                                                          • - -
                                                                              -
                                                                            • - - -

                                                                              Nested Class Summary

                                                                              - - - - - - - - - - - - - - - - - - - - - - -
                                                                              Nested Classes 
                                                                              Modifier and TypeClass and Description
                                                                              static class AES.InvalidAESStreamException -
                                                                              Thrown if an attempt is made to decrypt an invalid AES stream.
                                                                              -
                                                                              static class AES.InvalidKeyLengthException -
                                                                              Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                                              -
                                                                              static class AES.InvalidPasswordException -
                                                                              Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                                              -
                                                                              static class AES.StrongEncryptionNotAvailableException -
                                                                              Thrown if 192- or 256-bit AES encryption or decryption is attempted, - but not available on the particular Java platform.
                                                                              -
                                                                              -
                                                                              • -
                                                                            - -
                                                                              -
                                                                            • - - -

                                                                              Constructor Summary

                                                                              - - - - - - - - -
                                                                              Constructors 
                                                                              Constructor and Description
                                                                              AES() 
                                                                              -
                                                                              • -
                                                                            - - -
                                                                            • -
                                                                          -
                                                                          -
                                                                          -
                                                                            -
                                                                          • - -
                                                                              -
                                                                            • - - -

                                                                              Constructor Detail

                                                                              - - - -
                                                                                -
                                                                              • -

                                                                                AES

                                                                                -
                                                                                public AES()
                                                                                -
                                                                                • -
                                                                              -
                                                                              • -
                                                                            - -
                                                                              -
                                                                            • - - -

                                                                              Method Detail

                                                                              - - - -
                                                                                -
                                                                              • -

                                                                                encrypt

                                                                                -
                                                                                public static void encrypt(int keyLength,
-                           java.lang.String password,
-                           java.io.InputStream input,
-                           java.io.OutputStream output)
-                    throws AES.InvalidKeyLengthException,
-                           AES.StrongEncryptionNotAvailableException,
-                           java.io.IOException
                                                                                -
                                                                                Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
                                                                                -
                                                                                  -
                                                                                • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                  • -
                                                                                • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                  • -
                                                                                • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
                                                                                  • -
                                                                                • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                  • -
                                                                                -
                                                                                -
                                                                                Parameters:
                                                                                -
                                                                                keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                                                -
                                                                                password - password to use for encryption
                                                                                -
                                                                                input - an arbitrary byte stream to encrypt
                                                                                -
                                                                                output - stream to which encrypted data will be written
                                                                                -
                                                                                Throws:
                                                                                -
                                                                                AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                                                -
                                                                                AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
                                                                                -
                                                                                java.io.IOException
                                                                                -
                                                                                -
                                                                                • -
                                                                              - - - -
                                                                                -
                                                                              • -

                                                                                encrypt

                                                                                -
                                                                                public static byte[] encrypt(int keyLength,
-                             java.lang.String password,
-                             java.lang.String input)
-                      throws java.io.IOException,
-                             AES.StrongEncryptionNotAvailableException,
-                             AES.InvalidKeyLengthException
                                                                                -
                                                                                Encrypts a stream of data. The encrypted stream consists of a header - followed by the raw AES data. The header is broken down as follows:
                                                                                -
                                                                                  -
                                                                                • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                  • -
                                                                                • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                  • -
                                                                                • authentication key (derived from password and salt, used to - check validity of password upon decryption) (8 bytes)
                                                                                  • -
                                                                                • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                  • -
                                                                                -
                                                                                -
                                                                                Parameters:
                                                                                -
                                                                                keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                                                -
                                                                                password - password to use for encryption
                                                                                -
                                                                                input - an arbitrary string to encrypt
                                                                                -
                                                                                Returns:
                                                                                -
                                                                                string containing the encrypted data
                                                                                -
                                                                                Throws:
                                                                                -
                                                                                AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                                                -
                                                                                AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction - policy files do not allow 192- or 256-bit encryption
                                                                                -
                                                                                java.io.IOException
                                                                                -
                                                                                -
                                                                                • -
                                                                              - - - - - - - - -
                                                                              • -
                                                                            -
                                                                            • -
                                                                          -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          Skip navigation links
                                                                          - - - - -
                                                                          -
                                                                          - - - -
                                                                          - -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          - - - diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Cipher.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Cipher.html new file mode 100644 index 00000000..4d1c1690 --- /dev/null +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Cipher.html @@ -0,0 +1,286 @@ + + + + + +Cipher (SubServers.Sync) + + + + + + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          +
                                                                          +
                                                                            +
                                                                          • Summary: 
                                                                            • +
                                                                          • Nested | 
                                                                            • +
                                                                          • Field | 
                                                                            • +
                                                                          • Constr | 
                                                                            • +
                                                                          • Method
                                                                            • +
                                                                          +
                                                                            +
                                                                          • Detail: 
                                                                            • +
                                                                          • Field | 
                                                                            • +
                                                                          • Constr | 
                                                                            • +
                                                                          • Method
                                                                            • +
                                                                          +
                                                                          + + +
                                                                          + + +
                                                                          +
                                                                          net.ME1312.SubServers.Sync.Network
                                                                          +

                                                                          Interface Cipher

                                                                          +
                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • +
                                                                            +
                                                                            All Known Implementing Classes:
                                                                            +
                                                                            AES
                                                                            +
                                                                            +
                                                                            +
                                                                            +
                                                                            public interface Cipher
                                                                            +
                                                                            SubData Cipher Layout Class
                                                                            +
                                                                            • +
                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • + +
                                                                              +
                                                                            • + + +

                                                                              Method Summary

                                                                              + + + + + + + + + + + + + + + + + + +
                                                                              All Methods Instance Methods Abstract Methods 
                                                                              Modifier and TypeMethod and Description
                                                                              org.json.JSONObjectdecrypt(java.lang.String key, + byte[] data) +
                                                                              Decrypt Encrypted JSON Data
                                                                              +
                                                                              byte[]encrypt(java.lang.String key, + org.json.JSONObject data) +
                                                                              Encrypt JSON Data
                                                                              +
                                                                              java.lang.StringgetName() +
                                                                              Get the name of this Cipher
                                                                              +
                                                                              +
                                                                              • +
                                                                            +
                                                                            • +
                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • + +
                                                                              +
                                                                            • + + +

                                                                              Method Detail

                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                getName

                                                                                +
                                                                                java.lang.String getName()
                                                                                +
                                                                                Get the name of this Cipher
                                                                                +
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                Cipher Name
                                                                                +
                                                                                +
                                                                                • +
                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                encrypt

                                                                                +
                                                                                byte[] encrypt(java.lang.String key,
+               org.json.JSONObject data)
+        throws java.lang.Exception
                                                                                +
                                                                                Encrypt JSON Data
                                                                                +
                                                                                +
                                                                                Parameters:
                                                                                +
                                                                                key - Key to Encrypt Data with
                                                                                +
                                                                                data - Data to Encrypt
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                Encrypted Data Array
                                                                                +
                                                                                Throws:
                                                                                +
                                                                                java.lang.Exception
                                                                                +
                                                                                +
                                                                                • +
                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                decrypt

                                                                                +
                                                                                org.json.JSONObject decrypt(java.lang.String key,
+                            byte[] data)
+                     throws java.lang.Exception
                                                                                +
                                                                                Decrypt Encrypted JSON Data
                                                                                +
                                                                                +
                                                                                Parameters:
                                                                                +
                                                                                key - Key to Decrypt Data with
                                                                                +
                                                                                data - Encrypted Data Array
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                JSON Data
                                                                                +
                                                                                Throws:
                                                                                +
                                                                                java.lang.Exception
                                                                                +
                                                                                +
                                                                                • +
                                                                              +
                                                                              • +
                                                                            +
                                                                            • +
                                                                          +
                                                                          +
                                                                          + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          +
                                                                          +
                                                                            +
                                                                          • Summary: 
                                                                            • +
                                                                          • Nested | 
                                                                            • +
                                                                          • Field | 
                                                                            • +
                                                                          • Constr | 
                                                                            • +
                                                                          • Method
                                                                            • +
                                                                          +
                                                                            +
                                                                          • Detail: 
                                                                            • +
                                                                          • Field | 
                                                                            • +
                                                                          • Constr | 
                                                                            • +
                                                                          • Method
                                                                            • +
                                                                          +
                                                                          + + +
                                                                          + + + diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.InvalidAESStreamException.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/AES.InvalidAESStreamException.html similarity index 70% rename from Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.InvalidAESStreamException.html rename to Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/AES.InvalidAESStreamException.html index f0b83f30..e789d716 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/AES.InvalidAESStreamException.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/AES.InvalidAESStreamException.html @@ -4,8 +4,8 @@ AES.InvalidAESStreamException (SubServers.Sync) - - + + + + + + + + + + + + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          +
                                                                          + + +
                                                                          + + +
                                                                          + + +
                                                                          +
                                                                          net.ME1312.SubServers.Sync.Network.Ciphers
                                                                          +

                                                                          Class AES

                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • java.lang.Object
                                                                            • +
                                                                          • +
                                                                              +
                                                                            • net.ME1312.SubServers.Sync.Network.Ciphers.AES
                                                                              • +
                                                                            +
                                                                            • +
                                                                          +
                                                                          + +
                                                                          +
                                                                          +
                                                                            +
                                                                          • + +
                                                                              +
                                                                            • + + +

                                                                              Nested Class Summary

                                                                              + + + + + + + + + + + + + + + + + + + + + + +
                                                                              Nested Classes 
                                                                              Modifier and TypeClass and Description
                                                                              static class AES.InvalidAESStreamException +
                                                                              Thrown if an attempt is made to decrypt an invalid AES stream.
                                                                              +
                                                                              static class AES.InvalidKeyLengthException +
                                                                              Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                                              +
                                                                              static class AES.InvalidPasswordException +
                                                                              Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                                              +
                                                                              static class AES.StrongEncryptionNotAvailableException +
                                                                              Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                                                              +
                                                                              +
                                                                              • +
                                                                            + +
                                                                              +
                                                                            • + + +

                                                                              Constructor Summary

                                                                              + + + + + + + + +
                                                                              Constructors 
                                                                              Constructor and Description
                                                                              AES(int keyLength) +
                                                                              Constructor for use as a SubData Cipher
                                                                              +
                                                                              +
                                                                              • +
                                                                            + + +
                                                                            • +
                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • + +
                                                                              +
                                                                            • + + +

                                                                              Constructor Detail

                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                AES

                                                                                +
                                                                                public AES(int keyLength)
                                                                                +
                                                                                Constructor for use as a SubData Cipher
                                                                                +
                                                                                • +
                                                                              +
                                                                              • +
                                                                            + +
                                                                              +
                                                                            • + + +

                                                                              Method Detail

                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                encrypt

                                                                                +
                                                                                public static void encrypt(int keyLength,
+                           java.lang.String password,
+                           java.io.InputStream input,
+                           java.io.OutputStream output)
+                    throws AES.InvalidKeyLengthException,
+                           AES.StrongEncryptionNotAvailableException,
+                           java.io.IOException
                                                                                +
                                                                                Encrypts a stream of data. The encrypted stream consists of a header + followed by the raw AES data. The header is broken down as follows:
                                                                                +
                                                                                  +
                                                                                • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                  • +
                                                                                • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                  • +
                                                                                • authentication key (derived from password and salt, used to + check validity of password upon decryption) (8 bytes)
                                                                                  • +
                                                                                • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                  • +
                                                                                +
                                                                                +
                                                                                Parameters:
                                                                                +
                                                                                keyLength - key length to use for AES encryption (must be 128, 192, or 256)
                                                                                +
                                                                                password - password to use for encryption
                                                                                +
                                                                                input - an arbitrary byte stream to encrypt
                                                                                +
                                                                                output - stream to which encrypted data will be written
                                                                                +
                                                                                Throws:
                                                                                +
                                                                                AES.InvalidKeyLengthException - if keyLength is not 128, 192, or 256
                                                                                +
                                                                                AES.StrongEncryptionNotAvailableException - if keyLength is 192 or 256, but the Java runtime's jurisdiction + policy files do not allow 192- or 256-bit encryption
                                                                                +
                                                                                java.io.IOException
                                                                                +
                                                                                +
                                                                                • +
                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                encrypt

                                                                                +
                                                                                public byte[] encrypt(java.lang.String key,
+                      org.json.JSONObject data)
+               throws java.lang.Exception
                                                                                +
                                                                                This method calls to encrypt(int, String, InputStream, OutputStream), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                                                +
                                                                                +
                                                                                Specified by:
                                                                                +
                                                                                encrypt in interface Cipher
                                                                                +
                                                                                Parameters:
                                                                                +
                                                                                key - Key to Encrypt Data with
                                                                                +
                                                                                data - Data to Encrypt
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                Encrypted Data Array
                                                                                +
                                                                                Throws:
                                                                                +
                                                                                java.lang.Exception
                                                                                +
                                                                                +
                                                                                • +
                                                                              + + + +
                                                                                +
                                                                              • +

                                                                                getName

                                                                                +
                                                                                public java.lang.String getName()
                                                                                +
                                                                                Description copied from interface: Cipher
                                                                                +
                                                                                Get the name of this Cipher
                                                                                +
                                                                                +
                                                                                Specified by:
                                                                                +
                                                                                getName in interface Cipher
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                Cipher Name
                                                                                +
                                                                                +
                                                                                • +
                                                                              + + + + + + + +
                                                                                +
                                                                              • +

                                                                                decrypt

                                                                                +
                                                                                public org.json.JSONObject decrypt(java.lang.String key,
+                                   byte[] data)
+                            throws java.lang.Exception
                                                                                +
                                                                                This method calls to decrypt(String, InputStream, OutputStream)), simplified for the net.ME1312.SubServers.Bungee.Network.Cipher interface.
                                                                                +
                                                                                +
                                                                                Specified by:
                                                                                +
                                                                                decrypt in interface Cipher
                                                                                +
                                                                                Parameters:
                                                                                +
                                                                                key - Key to Decrypt Data with
                                                                                +
                                                                                data - Encrypted Data Array
                                                                                +
                                                                                Returns:
                                                                                +
                                                                                JSON Data
                                                                                +
                                                                                Throws:
                                                                                +
                                                                                java.lang.Exception
                                                                                +
                                                                                +
                                                                                • +
                                                                              +
                                                                              • +
                                                                            +
                                                                            • +
                                                                          +
                                                                          +
                                                                          + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          +
                                                                          + + +
                                                                          + + +
                                                                          + + + diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-frame.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-frame.html new file mode 100644 index 00000000..96f1b1b5 --- /dev/null +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-frame.html @@ -0,0 +1,26 @@ + + + + + +net.ME1312.SubServers.Sync.Network.Ciphers (SubServers.Sync) + + + + +

                                                                          net.ME1312.SubServers.Sync.Network.Ciphers

                                                                          +
                                                                          +

                                                                          Classes

                                                                          + +

                                                                          Exceptions

                                                                          + +
                                                                          + + diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-summary.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-summary.html new file mode 100644 index 00000000..be6712b5 --- /dev/null +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-summary.html @@ -0,0 +1,177 @@ + + + + + +net.ME1312.SubServers.Sync.Network.Ciphers (SubServers.Sync) + + + + + + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          + + +
                                                                          + +
                                                                          +

                                                                          Package net.ME1312.SubServers.Sync.Network.Ciphers

                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          • + + + + + + + + + + + + +
                                                                            Class Summary 
                                                                            ClassDescription
                                                                            AES +
                                                                            A class to perform password-based AES encryption and decryption in CBC mode.
                                                                            +
                                                                            +
                                                                            • +
                                                                          • + + + + + + + + + + + + + + + + + + + + + + + + +
                                                                            Exception Summary 
                                                                            ExceptionDescription
                                                                            AES.InvalidAESStreamException +
                                                                            Thrown if an attempt is made to decrypt an invalid AES stream.
                                                                            +
                                                                            AES.InvalidKeyLengthException +
                                                                            Thrown if an attempt is made to encrypt a stream with an invalid AES key length.
                                                                            +
                                                                            AES.InvalidPasswordException +
                                                                            Thrown if an attempt is made to decrypt a stream with an incorrect password.
                                                                            +
                                                                            AES.StrongEncryptionNotAvailableException +
                                                                            Thrown if 192- or 256-bit AES encryption or decryption is attempted, + but not available on the particular Java platform.
                                                                            +
                                                                            +
                                                                            • +
                                                                          +
                                                                          + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          + + +
                                                                          + + + diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-tree.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-tree.html new file mode 100644 index 00000000..c112e6b9 --- /dev/null +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Ciphers/package-tree.html @@ -0,0 +1,146 @@ + + + + + +net.ME1312.SubServers.Sync.Network.Ciphers Class Hierarchy (SubServers.Sync) + + + + + + + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          + + +
                                                                          + +
                                                                          +

                                                                          Hierarchy For Package net.ME1312.SubServers.Sync.Network.Ciphers

                                                                          +Package Hierarchies: + +
                                                                          +
                                                                          +

                                                                          Class Hierarchy

                                                                          + +
                                                                          + +
                                                                          + + +
                                                                          Skip navigation links
                                                                          + + + + +
                                                                          +
                                                                          + + + +
                                                                          + +
                                                                          + + +
                                                                          + + + diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-summary.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-summary.html index bd80200e..66c16139 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-summary.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-summary.html @@ -41,7 +41,7 @@
                                                                          @@ -185,7 +185,7 @@
                                                                          diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-tree.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-tree.html index 67e3e2f5..93222a43 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-tree.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/Packet/package-tree.html @@ -41,7 +41,7 @@
                                                                          @@ -117,7 +117,7 @@
                                                                          diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/PacketIn.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/PacketIn.html index 65d061c5..278b785f 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/PacketIn.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/PacketIn.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
                                                                          @@ -208,7 +208,7 @@ var activeTableTab = "activeTableTab";
                                                                          diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.Encryption.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.Encryption.html deleted file mode 100644 index 452bb109..00000000 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.Encryption.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - -SubDataClient.Encryption (SubServers.Sync) - - - - - - - -
                                                                          - - -
                                                                          Skip navigation links
                                                                          - - - - -
                                                                          -
                                                                          - - - -
                                                                          - -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          - - -
                                                                          -
                                                                          net.ME1312.SubServers.Sync.Network
                                                                          -

                                                                          Enum SubDataClient.Encryption

                                                                          -
                                                                          -
                                                                          -
                                                                            -
                                                                          • java.lang.Object
                                                                            • -
                                                                          • - -
                                                                            • -
                                                                          -
                                                                          - -
                                                                          -
                                                                          -
                                                                            -
                                                                          • - - - -
                                                                              -
                                                                            • - - -

                                                                              Method Summary

                                                                              - - - - - - - - - - - - - - -
                                                                              All Methods Static Methods Concrete Methods 
                                                                              Modifier and TypeMethod and Description
                                                                              static SubDataClient.EncryptionvalueOf(java.lang.String name) -
                                                                              Returns the enum constant of this type with the specified name.
                                                                              -
                                                                              static SubDataClient.Encryption[]values() -
                                                                              Returns an array containing the constants of this enum type, in -the order they are declared.
                                                                              -
                                                                              -
                                                                                -
                                                                              • - - -

                                                                                Methods inherited from class java.lang.Enum

                                                                                -compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                                                                                • -
                                                                              -
                                                                                -
                                                                              • - - -

                                                                                Methods inherited from class java.lang.Object

                                                                                -getClass, notify, notifyAll, wait, wait, wait
                                                                                • -
                                                                              -
                                                                              • -
                                                                            -
                                                                            • -
                                                                          -
                                                                          -
                                                                          -
                                                                            -
                                                                          • - - - -
                                                                              -
                                                                            • - - -

                                                                              Method Detail

                                                                              - - - -
                                                                                -
                                                                              • -

                                                                                values

                                                                                -
                                                                                public static SubDataClient.Encryption[] values()
                                                                                -
                                                                                Returns an array containing the constants of this enum type, in -the order they are declared. This method may be used to iterate -over the constants as follows: -
                                                                                -for (SubDataClient.Encryption c : SubDataClient.Encryption.values())
-    System.out.println(c);
-
                                                                                -
                                                                                -
                                                                                Returns:
                                                                                -
                                                                                an array containing the constants of this enum type, in the order they are declared
                                                                                -
                                                                                -
                                                                                • -
                                                                              - - - -
                                                                                -
                                                                              • -

                                                                                valueOf

                                                                                -
                                                                                public static SubDataClient.Encryption valueOf(java.lang.String name)
                                                                                -
                                                                                Returns the enum constant of this type with the specified name. -The string must match exactly an identifier used to declare an -enum constant in this type. (Extraneous whitespace characters are -not permitted.)
                                                                                -
                                                                                -
                                                                                Parameters:
                                                                                -
                                                                                name - the name of the enum constant to be returned.
                                                                                -
                                                                                Returns:
                                                                                -
                                                                                the enum constant with the specified name
                                                                                -
                                                                                Throws:
                                                                                -
                                                                                java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                                                                                -
                                                                                java.lang.NullPointerException - if the argument is null
                                                                                -
                                                                                -
                                                                                • -
                                                                              -
                                                                              • -
                                                                            -
                                                                            • -
                                                                          -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          Skip navigation links
                                                                          - - - - -
                                                                          -
                                                                          - - - -
                                                                          - -
                                                                          -
                                                                          - - -
                                                                          - - -
                                                                          - - - diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.html index a978df19..c52fca7f 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Network/SubDataClient.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":9,"i7":9,"i8":10,"i9":9,"i10":9}; +var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":9,"i7":10,"i8":9,"i9":9,"i10":9,"i11":10,"i12":9,"i13":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
                                                                          • Frames
                                                                            • @@ -72,7 +72,7 @@ var activeTableTab = "activeTableTab";
                                                                            • Summary: 
                                                                              • -
                                                                            • Nested | 
                                                                              • +
                                                                            • Nested | 
                                                                            • Field | 
                                                                            • Constr | 
                                                                            • Method
                                                                              • @@ -116,25 +116,6 @@ extends java.lang.Object
                                                                              • - -
                                                                                  -
                                                                                • - - -

                                                                                  Nested Class Summary

                                                                                  - - - - - - - - - - -
                                                                                  Nested Classes 
                                                                                  Modifier and TypeClass and Description
                                                                                  static class SubDataClient.Encryption 
                                                                                  -
                                                                                  • -
                                                                                • @@ -147,10 +128,10 @@ extends java.lang.Object Constructor and Description -SubDataClient(SubPlugin plugin, +SubDataClient(SubPlugin plugin, java.net.InetAddress address, int port, - SubDataClient.Encryption encryption) + Cipher cipher)
                                                                                  SubServers Client Instance
                                                                                  @@ -170,69 +151,88 @@ extends java.lang.Object Method and Description +static void +addCipher(java.lang.String handle, + Cipher cipher) +
                                                                                  Add a Cipher for use by SubData
                                                                                  + + + void broadcastPacket(PacketOut packet)
                                                                                  Broadcast packet to all Clients
                                                                                  - + void destroy(int reconnect)
                                                                                  Drops All Connections and Stops the SubData Listener
                                                                                  - + void forwardPacket(PacketOut packet, java.lang.String location)
                                                                                  Forward Packet to Client
                                                                                  - + +Cipher +getCipher() +
                                                                                  Gets the Client's Cipher
                                                                                  + + + +static Cipher +getCipher(java.lang.String handle) +
                                                                                  Gets a Cipher by Handle
                                                                                  + + + +static java.util.Map<java.lang.String,Cipher> +getCiphers() +
                                                                                  Gets the Ciphers
                                                                                  + + + java.net.Socket getClient()
                                                                                  Gets the Server Socket
                                                                                  - -SubDataClient.Encryption -getEncryption() -
                                                                                  Gets the Connection's Encryption method
                                                                                  - - - + static java.util.List<? extends PacketIn> getPacket(java.lang.String handle)
                                                                                  Grab PacketIn Instances via handle
                                                                                  - + static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle)
                                                                                  Register PacketOut to the Network
                                                                                  - + static void registerPacket(PacketIn packet, java.lang.String handle)
                                                                                  Register PacketIn to the Network
                                                                                  - + void sendPacket(PacketOut packet)
                                                                                  Send Packet to Server
                                                                                  - + static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
                                                                                  Unregister PacketOut to the Network
                                                                                  - + static void unregisterPacket(PacketIn packet)
                                                                                  Unregister PacketIn from the Network
                                                                                  @@ -260,7 +260,7 @@ extends java.lang.Object

                                                                                  Constructor Detail

                                                                                  - +
                                                                                    @@ -269,7 +269,7 @@ extends java.lang.Object 
                                                                                    public SubDataClient(SubPlugin plugin,
                      java.net.InetAddress address,
                      int port,
-                     SubDataClient.Encryption encryption)
+                     Cipher cipher)
               throws java.io.IOException
                                                                                    SubServers Client Instance
                                                                                    @@ -277,7 +277,7 @@ extends java.lang.Object
                                                                                    plugin - SubPlugin
                                                                                    address - Address
                                                                                    port - Port
                                                                                    -
                                                                                    encryption - Encryption Type
                                                                                    +
                                                                                    cipher - Cipher
                                                                                    Throws:
                                                                                    java.io.IOException
                                                                                    @@ -305,17 +305,63 @@ extends java.lang.Object
                                                                                  - +
                                                                                  • -

                                                                                    getEncryption

                                                                                    -
                                                                                    public SubDataClient.Encryption getEncryption()
                                                                                    -
                                                                                    Gets the Connection's Encryption method
                                                                                    +

                                                                                    addCipher

                                                                                    +
                                                                                    public static void addCipher(java.lang.String handle,
+                             Cipher cipher)
                                                                                    +
                                                                                    Add a Cipher for use by SubData
                                                                                    +
                                                                                    +
                                                                                    Parameters:
                                                                                    +
                                                                                    cipher - Cipher to Add
                                                                                    +
                                                                                    handle - Handle to Bind
                                                                                    +
                                                                                    +
                                                                                    • +
                                                                                  + + + +
                                                                                    +
                                                                                  • +

                                                                                    getCiphers

                                                                                    +
                                                                                    public static java.util.Map<java.lang.String,Cipher> getCiphers()
                                                                                    +
                                                                                    Gets the Ciphers
                                                                                    Returns:
                                                                                    -
                                                                                    Encryption method
                                                                                    +
                                                                                    Cipher Map
                                                                                    +
                                                                                    +
                                                                                    • +
                                                                                  + + + +
                                                                                    +
                                                                                  • +

                                                                                    getCipher

                                                                                    +
                                                                                    public Cipher getCipher()
                                                                                    +
                                                                                    Gets the Client's Cipher
                                                                                    +
                                                                                    +
                                                                                    Returns:
                                                                                    +
                                                                                    Cipher
                                                                                    +
                                                                                    +
                                                                                    • +
                                                                                  + + + +
                                                                                    +
                                                                                  • +

                                                                                    getCipher

                                                                                    +
                                                                                    public static Cipher getCipher(java.lang.String handle)
                                                                                    +
                                                                                    Gets a Cipher by Handle
                                                                                    +
                                                                                    +
                                                                                    Parameters:
                                                                                    +
                                                                                    handle - Handle
                                                                                    +
                                                                                    Returns:
                                                                                    +
                                                                                    Cipher
                                                                                  @@ -482,7 +528,7 @@ extends java.lang.Object
                                                                                  • Frames
                                                                                    • @@ -506,7 +552,7 @@ extends java.lang.Object
                                                                                  • -

                                                                                    Package net.ME1312.SubServers.Sync.Network

                                                                                    +

                                                                                    Package net.ME1312.SubServers.Sync.Network.Ciphers
                                                                                    • diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF index 6c3b5ad1..7419f689 100644 --- a/SubServers.Bungee/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Bungee.Launch Implementation-Version: 2.13a -Specification-Version: 1 +Specification-Version: 2 diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index 1d4b11d2..ce9615fe 100644 Binary files a/SubServers.Bungee/src.jar and b/SubServers.Bungee/src.jar differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml index 1df5822d..09a49e84 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml @@ -63,9 +63,6 @@ Lang: 'Command.Command.Unknown': '&cSubServers &4&l\u00BB&c There is no Server with that name' 'Command.Command.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' 'Command.Command.Not-Running': '&cSubServers &4&l\u00BB&c That SubServer is not running' - 'Command.Teleport': '&aSubServers &2&l\u00BB&a Teleporting...' - 'Command.Teleport.Offline': '&cSubServers &4&l\u00BB&c There is no player online with that name' - 'Command.Teleport.Invalid': '&cSubServers &4&l\u00BB&c There is no Server with that name' 'Command.Creator': '&aSubServers &2&l\u00BB&a Creating SubServer' 'Command.Creator.Exists': '&cSubServers &4&l\u00BB&c There is already a SubServer with that name' 'Command.Creator.Unknown-Host': '&cSubServers &4&l\u00BB&c There is no Host with that name' diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Cipher.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Cipher.java new file mode 100644 index 00000000..c6c30c85 --- /dev/null +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Cipher.java @@ -0,0 +1,33 @@ +package net.ME1312.SubServers.Bungee.Network; + +import org.json.JSONObject; + +/** + * SubData Cipher Layout Class + */ +public interface Cipher { + /** + * Get the name of this Cipher + * + * @return Cipher Name + */ + String getName(); + + /** + * Encrypt JSON Data + * + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array + */ + byte[] encrypt(String key, JSONObject data) throws Exception; + + /** + * Decrypt Encrypted JSON Data + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data + */ + JSONObject decrypt(String key, byte[] data) throws Exception; +} diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/AES.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.java similarity index 81% rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/AES.java rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.java index accc07fb..b9d59cca 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/AES.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Ciphers/AES.java @@ -1,6 +1,7 @@ -package net.ME1312.SubServers.Bungee.Network; +package net.ME1312.SubServers.Bungee.Network.Ciphers; import net.ME1312.SubServers.Bungee.Library.NamedContainer; +import org.json.JSONObject; import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; @@ -29,7 +30,7 @@ import java.util.Random; * * @author dweymouth@gmail.com */ -public final class AES { +public final class AES implements net.ME1312.SubServers.Bungee.Network.Cipher { // AES specification private static final String CIPHER_SPEC = "AES/CBC/PKCS5Padding"; @@ -43,6 +44,15 @@ public final class AES { // Process input/output streams in chunks private static final int BUFFER_SIZE = 1024; + // Hold Data for use by SubData Cipher methods + private final int keyLength; + + /** + * Constructor for use as a SubData Cipher + */ + public AES(int keyLength) { + this.keyLength = keyLength; + } /** * @return a new pseudorandom salt of the specified length @@ -163,37 +173,22 @@ public final class AES { } /** - * Encrypts a stream of data. The encrypted stream consists of a header - * followed by the raw AES data. The header is broken down as follows:
                                                                                    - *
                                                                                      - *
                                                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                      • - *
                                                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                      • - *
                                                                                    • authentication key (derived from password and salt, used to - * check validity of password upon decryption) (8 bytes)
                                                                                      • - *
                                                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                      • - *
                                                                                    + * This method calls to {@link #encrypt(int, String, InputStream, OutputStream)}, simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. * - * @param keyLength - * key length to use for AES encryption (must be 128, 192, or 256) - * @param password - * password to use for encryption - * @param input - * an arbitrary string to encrypt - * @return - * string containing the encrypted data - * @throws AES.InvalidKeyLengthException - * if keyLength is not 128, 192, or 256 - * @throws AES.StrongEncryptionNotAvailableException - * if keyLength is 192 or 256, but the Java runtime's jurisdiction - * policy files do not allow 192- or 256-bit encryption - * @throws IOException + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array */ - public static byte[] encrypt(int keyLength, String password, String input) throws IOException, StrongEncryptionNotAvailableException, InvalidKeyLengthException { + public byte[] encrypt(String key, JSONObject data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - encrypt(keyLength, password, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8)), bytes); + encrypt(keyLength, key, new ByteArrayInputStream(data.toString().getBytes(StandardCharsets.UTF_8)), bytes); return bytes.toByteArray(); } + public String getName() { + return "AES_" + keyLength; + } + /** * Decrypts a stream of data that was encrypted by {@link #encrypt}. * @param password @@ -268,25 +263,16 @@ public final class AES { } /** - * Decrypts a stream of data that was encrypted by {@link #encrypt}. - * @param password - * the password used to encrypt/decrypt the string - * @param input - * string of encrypted data to be decrypted - * @return the key length for the decrypted string (128, 192, or 256) and the string of decrypted data - * @throws AES.InvalidPasswordException - * if the given password was not used to encrypt the data - * @throws AES.InvalidAESStreamException - * if the given input stream is not a valid AES-encrypted stream - * @throws AES.StrongEncryptionNotAvailableException - * if the stream is 192 or 256-bit encrypted, and the Java runtime's - * jurisdiction policy files do not allow for AES-192 or 256 - * @throws IOException + * This method calls to {@link #decrypt(String, InputStream, OutputStream)}), simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data */ - public static NamedContainer decrypt(String password, byte[] input) throws IOException, StrongEncryptionNotAvailableException, InvalidAESStreamException, InvalidPasswordException { + public JSONObject decrypt(String key, byte[] data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - int keyLength = decrypt(password, new ByteArrayInputStream(input), bytes); - return new NamedContainer<>(keyLength, new String(bytes.toByteArray(), StandardCharsets.UTF_8)); + decrypt(key, new ByteArrayInputStream(data), bytes); + return new JSONObject(new String(bytes.toByteArray(), StandardCharsets.UTF_8)); } /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java index 9e1b8214..25a715ca 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Bungee.Network; import net.ME1312.SubServers.Bungee.Library.Exception.IllegalPacketException; import net.ME1312.SubServers.Bungee.Library.Util; +import net.ME1312.SubServers.Bungee.Network.Ciphers.AES; import net.ME1312.SubServers.Bungee.Network.Packet.PacketAuthorization; import org.json.JSONException; import org.json.JSONObject; @@ -60,19 +61,8 @@ public class Client { BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream())); String input; while ((input = in.readLine()) != null) { - String decoded = null; try { - switch (subdata.getEncryption()) { - case AES: - case AES_128: - case AES_192: - case AES_256: - decoded = AES.decrypt(subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)).get(); - break; - default: - decoded = new String(Base64.getDecoder().decode(input), StandardCharsets.UTF_8); - } - JSONObject json = new JSONObject(decoded); + JSONObject json = subdata.getCipher().decrypt(subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)); for (PacketIn packet : SubDataServer.decodePacket(this, json)) { boolean auth = authorized == null; if (auth || packet instanceof PacketAuthorization) { @@ -104,7 +94,7 @@ public class Client { } } } catch (JSONException e) { - new IllegalPacketException(getAddress().toString() + ": Unknown Packet Format: " + ((decoded == null || decoded.length() <= 0)?input:decoded)).printStackTrace(); + new IllegalPacketException(getAddress().toString() + ": Unknown Packet Format: " + input).printStackTrace(); } catch (IllegalPacketException e) { e.printStackTrace(); } catch (Exception e) { @@ -146,20 +136,7 @@ public class Client { public void sendPacket(PacketOut packet) { if (Util.isNull(packet)) throw new NullPointerException(); try { - switch (subdata.getEncryption()) { - case AES: - case AES_128: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(128, subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), SubDataServer.encodePacket(this, packet).toString()))); - break; - case AES_192: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(192, subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), SubDataServer.encodePacket(this, packet).toString()))); - break; - case AES_256: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(256, subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), SubDataServer.encodePacket(this, packet).toString()))); - break; - default: - writer.println(Base64.getEncoder().encodeToString(SubDataServer.encodePacket(this, packet).toString().getBytes(StandardCharsets.UTF_8))); - } + writer.println(Base64.getEncoder().encodeToString(subdata.getCipher().encrypt(subdata.plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), SubDataServer.encodePacket(this, packet)))); } catch (Throwable e) { e.printStackTrace(); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java index 76b267c5..3496b9ec 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java @@ -3,6 +3,7 @@ package net.ME1312.SubServers.Bungee.Network; import net.ME1312.SubServers.Bungee.Library.Exception.IllegalPacketException; import net.ME1312.SubServers.Bungee.Library.Util; import net.ME1312.SubServers.Bungee.Library.Version.Version; +import net.ME1312.SubServers.Bungee.Network.Ciphers.AES; import net.ME1312.SubServers.Bungee.Network.Packet.*; import net.ME1312.SubServers.Bungee.SubPlugin; import org.json.JSONObject; @@ -10,10 +11,8 @@ import org.json.JSONObject; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.*; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; +import java.nio.charset.StandardCharsets; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -24,32 +23,25 @@ public final class SubDataServer { private static int MAX_QUEUE = 64; private static HashMap, String> pOut = new HashMap, String>(); private static HashMap> pIn = new HashMap>(); + private static HashMap ciphers = new HashMap(); private static List allowedAddresses = new ArrayList(); private static boolean defaults = false; private HashMap clients = new HashMap(); private ServerSocket server; - private Encryption encryption; + private Cipher cipher; protected SubPlugin plugin; - public enum Encryption { - NONE, - AES, - AES_128, - AES_192, - AES_256, - } - /** * SubData Server Instance * * @param plugin SubPlugin * @param port Port * @param address Bind - * @param encryption Encryption Type + * @param cipher Cipher (or null for none) * @throws IOException */ - public SubDataServer(SubPlugin plugin, int port, InetAddress address, Encryption encryption) throws IOException { - if (Util.isNull(plugin, port, encryption, MAX_QUEUE)) throw new NullPointerException(); + public SubDataServer(SubPlugin plugin, int port, InetAddress address, Cipher cipher) throws IOException { + if (Util.isNull(plugin, port, MAX_QUEUE)) throw new NullPointerException(); if (address == null) { server = new ServerSocket(port, MAX_QUEUE); allowConnection("127.0.0.1"); @@ -58,12 +50,30 @@ public final class SubDataServer { allowConnection(address.getHostAddress()); } this.plugin = plugin; - this.encryption = encryption; + this.cipher = (cipher != null)?cipher:new Cipher() { + @Override + public String getName() { + return "NONE"; + } + @Override + public byte[] encrypt(String key, JSONObject data) throws Exception { + return data.toString().getBytes(StandardCharsets.UTF_8); + } + @Override + public JSONObject decrypt(String key, byte[] data) throws Exception { + return new JSONObject(new String(data, StandardCharsets.UTF_8)); + } + }; if (!defaults) loadDefaults(); } - private void loadDefaults() { + static { + addCipher("AES", new AES(128)); + addCipher("AES_128", new AES(128)); + addCipher("AES_192", new AES(192)); + addCipher("AES_256", new AES(256)); + } private void loadDefaults() { defaults = true; plugin.getPluginManager().registerListener(null, new PacketOutRunEvent(plugin)); @@ -130,12 +140,43 @@ public final class SubDataServer { } /** - * Gets the Server's Encryption method + * Add a Cipher for use by SubData * - * @return Encryption method + * @param cipher Cipher to Add + * @param handle Handle to Bind */ - public Encryption getEncryption() { - return encryption; + public static void addCipher(String handle, Cipher cipher) { + if (Util.isNull(cipher)) throw new NullPointerException(); + if (!ciphers.keySet().contains(handle.toLowerCase().replace('-', '_').replace(' ', '_'))) + ciphers.put(handle.toLowerCase().replace('-', '_').replace(' ', '_'), cipher); + } + + /** + * Gets the Ciphers + * + * @return Cipher Map + */ + public static Map getCiphers() { + return new TreeMap<>(ciphers); + } + + /** + * Gets the Server's Cipher + * + * @return Cipher + */ + public Cipher getCipher() { + return cipher; + } + + /** + * Gets a Cipher by Handle + * + * @param handle Handle + * @return Cipher + */ + public static Cipher getCipher(String handle) { + return getCiphers().get(handle.toLowerCase().replace('-', '_').replace(' ', '_')); } /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index e4bb4bb0..2d7617fd 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -8,6 +8,7 @@ import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; import net.ME1312.SubServers.Bungee.Library.Version.Version; +import net.ME1312.SubServers.Bungee.Network.Cipher; import net.ME1312.SubServers.Bungee.Network.ClientHandler; import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutReload; import net.ME1312.SubServers.Bungee.Network.SubDataServer; @@ -229,17 +230,19 @@ public final class SubPlugin extends BungeeCord implements Listener { ) { if (subdata != null) subdata.destroy(); - SubDataServer.Encryption encryption = SubDataServer.Encryption.NONE; - if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { - System.out.println("SubData > Cannot encrypt connection without a password"); - } else if (Util.isException(() -> SubDataServer.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()))) { - System.out.println("SubData > Unknown encryption type: " + SubDataServer.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "None"))); - } else { - encryption = SubDataServer.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()); + Cipher cipher = null; + if (!config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").equalsIgnoreCase("NONE")) { + if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { + System.out.println("SubData > Cannot encrypt connection without a password"); + } else if (!SubDataServer.getCiphers().keySet().contains(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption").toLowerCase().replace('-', '_').replace(' ', '_'))) { + System.out.println("SubData > Unknown encryption type: " + config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } else { + cipher = SubDataServer.getCipher(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } } subdata = new SubDataServer(this, Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[1]), (config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[0].equals("0.0.0.0"))?null:InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[0]), - encryption); + cipher); System.out.println("SubServers > SubData Direct Listening on " + subdata.getServer().getLocalSocketAddress().toString()); loop(); } // Add new entries to Allowed-Connections diff --git a/SubServers.Client/Bukkit/module_subservers.client.bukkit.xml b/SubServers.Client/Bukkit/module_subservers.client.bukkit.xml deleted file mode 100644 index 02d3c519..00000000 --- a/SubServers.Client/Bukkit/module_subservers.client.bukkit.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index 5feb2a3b..d9ea309b 100644 Binary files a/SubServers.Client/Bukkit/src.jar and b/SubServers.Client/Bukkit/src.jar differ diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.java new file mode 100644 index 00000000..28baca50 --- /dev/null +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Cipher.java @@ -0,0 +1,33 @@ +package net.ME1312.SubServers.Client.Bukkit.Network; + +import org.json.JSONObject; + +/** + * SubData Cipher Layout Class + */ +public interface Cipher { + /** + * Get the name of this Cipher + * + * @return Cipher Name + */ + String getName(); + + /** + * Encrypt JSON Data + * + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array + */ + byte[] encrypt(String key, JSONObject data) throws Exception; + + /** + * Decrypt Encrypted JSON Data + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data + */ + JSONObject decrypt(String key, byte[] data) throws Exception; +} diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/AES.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.java similarity index 80% rename from SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/AES.java rename to SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.java index a7727125..20e041dc 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/AES.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Ciphers/AES.java @@ -1,6 +1,6 @@ -package net.ME1312.SubServers.Sync.Network; +package net.ME1312.SubServers.Client.Bukkit.Network.Ciphers; -import net.ME1312.SubServers.Sync.Library.NamedContainer; +import org.json.JSONObject; import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; @@ -29,7 +29,7 @@ import java.util.Random; * * @author dweymouth@gmail.com */ -public final class AES { +public final class AES implements net.ME1312.SubServers.Client.Bukkit.Network.Cipher { // AES specification private static final String CIPHER_SPEC = "AES/CBC/PKCS5Padding"; @@ -43,6 +43,15 @@ public final class AES { // Process input/output streams in chunks private static final int BUFFER_SIZE = 1024; + // Hold Data for use by SubData Cipher methods + private final int keyLength; + + /** + * Constructor for use as a SubData Cipher + */ + public AES(int keyLength) { + this.keyLength = keyLength; + } /** * @return a new pseudorandom salt of the specified length @@ -163,37 +172,22 @@ public final class AES { } /** - * Encrypts a stream of data. The encrypted stream consists of a header - * followed by the raw AES data. The header is broken down as follows:
                                                                                    - *
                                                                                      - *
                                                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                      • - *
                                                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                      • - *
                                                                                    • authentication key (derived from password and salt, used to - * check validity of password upon decryption) (8 bytes)
                                                                                      • - *
                                                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                      • - *
                                                                                    + * This method calls to {@link #encrypt(int, String, InputStream, OutputStream)}, simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. * - * @param keyLength - * key length to use for AES encryption (must be 128, 192, or 256) - * @param password - * password to use for encryption - * @param input - * an arbitrary string to encrypt - * @return - * string containing the encrypted data - * @throws AES.InvalidKeyLengthException - * if keyLength is not 128, 192, or 256 - * @throws AES.StrongEncryptionNotAvailableException - * if keyLength is 192 or 256, but the Java runtime's jurisdiction - * policy files do not allow 192- or 256-bit encryption - * @throws IOException + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array */ - public static byte[] encrypt(int keyLength, String password, String input) throws IOException, StrongEncryptionNotAvailableException, InvalidKeyLengthException { + public byte[] encrypt(String key, JSONObject data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - encrypt(keyLength, password, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8)), bytes); + encrypt(keyLength, key, new ByteArrayInputStream(data.toString().getBytes(StandardCharsets.UTF_8)), bytes); return bytes.toByteArray(); } + public String getName() { + return "AES_" + keyLength; + } + /** * Decrypts a stream of data that was encrypted by {@link #encrypt}. * @param password @@ -268,25 +262,16 @@ public final class AES { } /** - * Decrypts a stream of data that was encrypted by {@link #encrypt}. - * @param password - * the password used to encrypt/decrypt the string - * @param input - * string of encrypted data to be decrypted - * @return the key length for the decrypted string (128, 192, or 256) and the string of decrypted data - * @throws AES.InvalidPasswordException - * if the given password was not used to encrypt the data - * @throws AES.InvalidAESStreamException - * if the given input stream is not a valid AES-encrypted stream - * @throws AES.StrongEncryptionNotAvailableException - * if the stream is 192 or 256-bit encrypted, and the Java runtime's - * jurisdiction policy files do not allow for AES-192 or 256 - * @throws IOException + * This method calls to {@link #decrypt(String, InputStream, OutputStream)}), simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data */ - public static NamedContainer decrypt(String password, byte[] input) throws IOException, StrongEncryptionNotAvailableException, InvalidAESStreamException, InvalidPasswordException { + public JSONObject decrypt(String key, byte[] data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - int keyLength = decrypt(password, new ByteArrayInputStream(input), bytes); - return new NamedContainer<>(keyLength, new String(bytes.toByteArray(), StandardCharsets.UTF_8)); + decrypt(key, new ByteArrayInputStream(data), bytes); + return new JSONObject(new String(bytes.toByteArray(), StandardCharsets.UTF_8)); } /** diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java index beac8955..6459b43b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java @@ -7,6 +7,7 @@ import net.ME1312.SubServers.Client.Bukkit.Library.Exception.IllegalPacketExcept import net.ME1312.SubServers.Client.Bukkit.Library.NamedContainer; import net.ME1312.SubServers.Client.Bukkit.Library.Util; import net.ME1312.SubServers.Client.Bukkit.Library.Version.Version; +import net.ME1312.SubServers.Client.Bukkit.Network.Ciphers.AES; import net.ME1312.SubServers.Client.Bukkit.Network.Packet.*; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; import org.bukkit.Bukkit; @@ -28,22 +29,15 @@ import java.util.*; public final class SubDataClient { private static HashMap, String> pOut = new HashMap, String>(); private static HashMap> pIn = new HashMap>(); + private static HashMap ciphers = new HashMap(); private static boolean defaults = false; private PrintWriter writer; private NamedContainer socket; private String name; - private Encryption encryption; + private Cipher cipher; private SubPlugin plugin; private LinkedList> queue; - public enum Encryption { - NONE, - AES, - AES_128, - AES_192, - AES_256 - } - /** * SubServers Client Instance * @@ -51,17 +45,30 @@ public final class SubDataClient { * @param name Server Name * @param address Address * @param port Port - * @param encryption Encryption Type + * @param cipher Cipher * @throws IOException */ - public SubDataClient(SubPlugin plugin, String name, InetAddress address, int port, Encryption encryption) throws IOException { + public SubDataClient(SubPlugin plugin, String name, InetAddress address, int port, Cipher cipher) throws IOException { if (Util.isNull(plugin, name, address, port)) throw new NullPointerException(); socket = new NamedContainer<>(false, new Socket(address, port)); this.plugin = plugin; this.name = name; this.writer = new PrintWriter(socket.get().getOutputStream(), true); - this.encryption = encryption; this.queue = new LinkedList>(); + this.cipher = (cipher != null)?cipher:new Cipher() { + @Override + public String getName() { + return "NONE"; + } + @Override + public byte[] encrypt(String key, JSONObject data) throws Exception { + return data.toString().getBytes(StandardCharsets.UTF_8); + } + @Override + public JSONObject decrypt(String key, byte[] data) throws Exception { + return new JSONObject(new String(data, StandardCharsets.UTF_8)); + } + }; if (!defaults) loadDefaults(); loop(); @@ -79,7 +86,12 @@ public final class SubDataClient { Bukkit.getPluginManager().callEvent(new SubNetworkConnectEvent(this)); } - private void loadDefaults() { + static { + addCipher("AES", new AES(128)); + addCipher("AES_128", new AES(128)); + addCipher("AES_192", new AES(192)); + addCipher("AES_256", new AES(256)); + } private void loadDefaults() { defaults = true; registerPacket(new PacketAuthorization(plugin), "Authorization"); @@ -120,19 +132,8 @@ public final class SubDataClient { BufferedReader in = new BufferedReader(new InputStreamReader(socket.get().getInputStream())); String input; while ((input = in.readLine()) != null) { - String decoded = null; try { - switch (getEncryption()) { - case AES: - case AES_128: - case AES_192: - case AES_256: - decoded = AES.decrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)).get(); - break; - default: - decoded = new String(Base64.getDecoder().decode(input), StandardCharsets.UTF_8); - } - JSONObject json = new JSONObject(decoded); + JSONObject json = cipher.decrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)); for (PacketIn packet : decodePacket(json)) { if (plugin.isEnabled()) Bukkit.getScheduler().runTask(plugin, () -> { try { @@ -143,7 +144,7 @@ public final class SubDataClient { }); } } catch (JSONException e) { - new IllegalPacketException("Unknown Packet Format: " + ((decoded == null || decoded.length() <= 0) ? input : decoded)).printStackTrace(); + new IllegalPacketException("Unknown Packet Format: " + input).printStackTrace(); } catch (IllegalPacketException e) { e.printStackTrace(); } catch (Exception e) { @@ -176,21 +177,52 @@ public final class SubDataClient { } /** - * Gets the Server Socket + * Gets the Client Socket * - * @return Server Socket + * @return Client Socket */ public Socket getClient() { return socket.get(); } /** - * Gets the Connection's Encryption method + * Add a Cipher for use by SubData * - * @return Encryption method + * @param cipher Cipher to Add + * @param handle Handle to Bind */ - public Encryption getEncryption() { - return encryption; + public static void addCipher(String handle, Cipher cipher) { + if (Util.isNull(cipher)) throw new NullPointerException(); + if (!ciphers.keySet().contains(handle.toLowerCase().replace('-', '_').replace(' ', '_'))) + ciphers.put(handle.toLowerCase().replace('-', '_').replace(' ', '_'), cipher); + } + + /** + * Gets the Ciphers + * + * @return Cipher Map + */ + public static Map getCiphers() { + return new TreeMap<>(ciphers); + } + + /** + * Gets the Client's Cipher + * + * @return Cipher + */ + public Cipher getCipher() { + return cipher; + } + + /** + * Gets a Cipher by Handle + * + * @param handle Handle + * @return Cipher + */ + public static Cipher getCipher(String handle) { + return getCiphers().get(handle.toLowerCase().replace('-', '_').replace(' ', '_')); } /** @@ -278,20 +310,7 @@ public final class SubDataClient { try { JSONObject json = encodePacket(packet.get()); if (packet.name() != null) json.put("f", packet.name()); - switch (getEncryption()) { - case AES: - case AES_128: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(128, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_192: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(192, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_256: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(256, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - default: - writer.println(Base64.getEncoder().encodeToString(json.toString().getBytes(StandardCharsets.UTF_8))); - } + writer.println(Base64.getEncoder().encodeToString(cipher.encrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json))); } catch (Throwable e) { e.printStackTrace(); } @@ -389,7 +408,7 @@ public final class SubDataClient { @Override public void run() { try { - plugin.subdata = new SubDataClient(plugin, name, socket.getInetAddress(), socket.getPort(), encryption); + plugin.subdata = new SubDataClient(plugin, name, socket.getInetAddress(), socket.getPort(), cipher); while (queue.size() != 0) { if (queue.get(0).name() != null) { plugin.subdata.forwardPacket(queue.get(0).get(), queue.get(0).name()); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 57b33459..efe803db 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -8,6 +8,7 @@ import net.ME1312.SubServers.Client.Bukkit.Library.NamedContainer; import net.ME1312.SubServers.Client.Bukkit.Library.UniversalFile; import net.ME1312.SubServers.Client.Bukkit.Library.Util; import net.ME1312.SubServers.Client.Bukkit.Library.Version.Version; +import net.ME1312.SubServers.Client.Bukkit.Network.Cipher; import net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -39,7 +40,7 @@ public final class SubPlugin extends JavaPlugin { public UIHandler gui = null; public final Version version; - public final Version bversion = new Version(1); + public final Version bversion = new Version(2); public final SubAPI api = new SubAPI(this); public SubPlugin() { @@ -116,17 +117,19 @@ public final class SubPlugin extends JavaPlugin { config.reload(); - SubDataClient.Encryption encryption = SubDataClient.Encryption.NONE; - if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { - System.out.println("SubData > Cannot encrypt connection without a password"); - } else if (Util.isException(() -> SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()))) { - System.out.println("SubData > Unknown encryption type: " + SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "None"))); - } else { - encryption = SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()); + Cipher cipher = null; + if (!config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").equalsIgnoreCase("NONE")) { + if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { + System.out.println("SubData > Cannot encrypt connection without a password"); + } else if (!SubDataClient.getCiphers().keySet().contains(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption").toLowerCase().replace('-', '_').replace(' ', '_'))) { + System.out.println("SubData > Unknown encryption type: " + config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } else { + cipher = SubDataClient.getCipher(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } } subdata = new SubDataClient(this, config.get().getSection("Settings").getSection("SubData").getString("Name", "undefined"), InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]), - Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), encryption); + Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), cipher); if (notifyPlugins) { List listeners = api.reloadListeners; diff --git a/SubServers.Client/Bukkit/src/plugin.yml b/SubServers.Client/Bukkit/src/plugin.yml index 82a42ba8..5726a45d 100644 --- a/SubServers.Client/Bukkit/src/plugin.yml +++ b/SubServers.Client/Bukkit/src/plugin.yml @@ -59,5 +59,5 @@ permissions: description: 'Grants Acces to Teleport Others to a Server' default: op subservers.server.teleport.*: - description: 'Grants Acces to Teleport to a Server' + description: 'Grants Access to Teleport to a Server' default: op \ No newline at end of file diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 1151ad5f..7e74ebe1 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index ba6a527f..0b80cf90 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -17,6 +17,7 @@ import net.ME1312.SubServers.Host.Library.NamedContainer; import net.ME1312.SubServers.Host.Library.UniversalFile; import net.ME1312.SubServers.Host.Library.Util; import net.ME1312.SubServers.Host.Library.Version.Version; +import net.ME1312.SubServers.Host.Network.Cipher; import net.ME1312.SubServers.Host.Network.SubDataClient; import org.json.JSONObject; import org.w3c.dom.Document; @@ -55,7 +56,7 @@ public final class ExHost { public SubDataClient subdata = null; public final Version version = new Version("2.13a"); - public final Version bversion = new Version(1); + public final Version bversion = new Version(2); public final SubAPI api = new SubAPI(this); private boolean running = false; @@ -126,17 +127,19 @@ public final class ExHost { } } running = true; - SubDataClient.Encryption encryption = SubDataClient.Encryption.NONE; - if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { - log.info.println("Cannot encrypt connection without a password"); - } else if (Util.isException(() -> SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()))) { - log.info.println("Unknown encryption type: " + SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "None"))); - } else { - encryption = SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()); + Cipher cipher = null; + if (!config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").equalsIgnoreCase("NONE")) { + if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { + log.info.println("Cannot encrypt connection without a password"); + } else if (!SubDataClient.getCiphers().keySet().contains(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption").toLowerCase().replace('-', '_').replace(' ', '_'))) { + log.info.println("Unknown encryption type: " + config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } else { + cipher = SubDataClient.getCipher(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } } subdata = new SubDataClient(this, config.get().getSection("Settings").getSection("SubData").getString("Name", "undefined"), InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]), - Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), encryption); + Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), cipher); Runtime.getRuntime().addShutdownHook(new Thread(() -> { if (running) { log.warn.println("Received request from system to shutdown"); @@ -303,17 +306,19 @@ public final class ExHost { config.reload(); - SubDataClient.Encryption encryption = SubDataClient.Encryption.NONE; - if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { - log.info.println("Cannot encrypt connection without a password"); - } else if (Util.isException(() -> SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()))) { - log.info.println("Unknown encryption type: " + SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "None"))); - } else { - encryption = SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()); + Cipher cipher = null; + if (!config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").equalsIgnoreCase("NONE")) { + if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { + log.info.println("Cannot encrypt connection without a password"); + } else if (!SubDataClient.getCiphers().keySet().contains(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption").toLowerCase().replace('-', '_').replace(' ', '_'))) { + log.info.println("Unknown encryption type: " + config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } else { + cipher = SubDataClient.getCipher(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } } subdata = new SubDataClient(this, config.get().getSection("Settings").getSection("SubData").getString("Name", "undefined"), InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]), - Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), encryption); + Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]), cipher); SubAPI.getInstance().executeEvent(new SubReloadEvent(this)); } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Cipher.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Cipher.java new file mode 100644 index 00000000..b7ffb9a6 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Cipher.java @@ -0,0 +1,33 @@ +package net.ME1312.SubServers.Host.Network; + +import org.json.JSONObject; + +/** + * SubData Cipher Layout Class + */ +public interface Cipher { + /** + * Get the name of this Cipher + * + * @return Cipher Name + */ + String getName(); + + /** + * Encrypt JSON Data + * + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array + */ + byte[] encrypt(String key, JSONObject data) throws Exception; + + /** + * Decrypt Encrypted JSON Data + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data + */ + JSONObject decrypt(String key, byte[] data) throws Exception; +} diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/AES.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Ciphers/AES.java similarity index 80% rename from SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/AES.java rename to SubServers.Host/src/net/ME1312/SubServers/Host/Network/Ciphers/AES.java index 577f4481..84f269a0 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/AES.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Ciphers/AES.java @@ -1,6 +1,6 @@ -package net.ME1312.SubServers.Client.Bukkit.Network; +package net.ME1312.SubServers.Host.Network.Ciphers; -import net.ME1312.SubServers.Client.Bukkit.Library.NamedContainer; +import org.json.JSONObject; import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; @@ -29,7 +29,7 @@ import java.util.Random; * * @author dweymouth@gmail.com */ -public final class AES { +public final class AES implements net.ME1312.SubServers.Host.Network.Cipher { // AES specification private static final String CIPHER_SPEC = "AES/CBC/PKCS5Padding"; @@ -43,6 +43,15 @@ public final class AES { // Process input/output streams in chunks private static final int BUFFER_SIZE = 1024; + // Hold Data for use by SubData Cipher methods + private final int keyLength; + + /** + * Constructor for use as a SubData Cipher + */ + public AES(int keyLength) { + this.keyLength = keyLength; + } /** * @return a new pseudorandom salt of the specified length @@ -163,37 +172,22 @@ public final class AES { } /** - * Encrypts a stream of data. The encrypted stream consists of a header - * followed by the raw AES data. The header is broken down as follows:
                                                                                    - *
                                                                                      - *
                                                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                      • - *
                                                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                      • - *
                                                                                    • authentication key (derived from password and salt, used to - * check validity of password upon decryption) (8 bytes)
                                                                                      • - *
                                                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                      • - *
                                                                                    + * This method calls to {@link #encrypt(int, String, InputStream, OutputStream)}, simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. * - * @param keyLength - * key length to use for AES encryption (must be 128, 192, or 256) - * @param password - * password to use for encryption - * @param input - * an arbitrary string to encrypt - * @return - * string containing the encrypted data - * @throws AES.InvalidKeyLengthException - * if keyLength is not 128, 192, or 256 - * @throws AES.StrongEncryptionNotAvailableException - * if keyLength is 192 or 256, but the Java runtime's jurisdiction - * policy files do not allow 192- or 256-bit encryption - * @throws IOException + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array */ - public static byte[] encrypt(int keyLength, String password, String input) throws IOException, StrongEncryptionNotAvailableException, InvalidKeyLengthException { + public byte[] encrypt(String key, JSONObject data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - encrypt(keyLength, password, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8)), bytes); + encrypt(keyLength, key, new ByteArrayInputStream(data.toString().getBytes(StandardCharsets.UTF_8)), bytes); return bytes.toByteArray(); } + public String getName() { + return "AES_" + keyLength; + } + /** * Decrypts a stream of data that was encrypted by {@link #encrypt}. * @param password @@ -268,25 +262,16 @@ public final class AES { } /** - * Decrypts a stream of data that was encrypted by {@link #encrypt}. - * @param password - * the password used to encrypt/decrypt the string - * @param input - * string of encrypted data to be decrypted - * @return the key length for the decrypted string (128, 192, or 256) and the string of decrypted data - * @throws AES.InvalidPasswordException - * if the given password was not used to encrypt the data - * @throws AES.InvalidAESStreamException - * if the given input stream is not a valid AES-encrypted stream - * @throws AES.StrongEncryptionNotAvailableException - * if the stream is 192 or 256-bit encrypted, and the Java runtime's - * jurisdiction policy files do not allow for AES-192 or 256 - * @throws IOException + * This method calls to {@link #decrypt(String, InputStream, OutputStream)}), simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data */ - public static NamedContainer decrypt(String password, byte[] input) throws IOException, StrongEncryptionNotAvailableException, InvalidAESStreamException, InvalidPasswordException { + public JSONObject decrypt(String key, byte[] data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - int keyLength = decrypt(password, new ByteArrayInputStream(input), bytes); - return new NamedContainer<>(keyLength, new String(bytes.toByteArray(), StandardCharsets.UTF_8)); + decrypt(key, new ByteArrayInputStream(data), bytes); + return new JSONObject(new String(bytes.toByteArray(), StandardCharsets.UTF_8)); } /** diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java index e499429b..4ad55d37 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java @@ -7,6 +7,7 @@ import net.ME1312.SubServers.Host.Library.Log.Logger; import net.ME1312.SubServers.Host.Library.NamedContainer; import net.ME1312.SubServers.Host.Library.Util; import net.ME1312.SubServers.Host.Library.Version.Version; +import net.ME1312.SubServers.Host.Network.Ciphers.AES; import net.ME1312.SubServers.Host.Network.Packet.*; import net.ME1312.SubServers.Host.SubAPI; import net.ME1312.SubServers.Host.ExHost; @@ -32,23 +33,16 @@ import java.util.concurrent.TimeUnit; public final class SubDataClient { private static HashMap, String> pOut = new HashMap, String>(); private static HashMap> pIn = new HashMap>(); + private static HashMap ciphers = new HashMap(); private static boolean defaults = false; protected static Logger log; private PrintWriter writer; private NamedContainer socket; private String name; - private Encryption encryption; + private Cipher cipher; private ExHost host; private LinkedList> queue; - public enum Encryption { - NONE, - AES, - AES_128, - AES_192, - AES_256 - } - /** * SubServers Client Instance * @@ -56,17 +50,30 @@ public final class SubDataClient { * @param name Name of Host * @param address Address * @param port Port - * @param encryption Encryption Type + * @param cipher Cipher * @throws IOException */ - public SubDataClient(ExHost host, String name, InetAddress address, int port, Encryption encryption) throws IOException { - if (Util.isNull(host, name, address, port, encryption)) throw new NullPointerException(); + public SubDataClient(ExHost host, String name, InetAddress address, int port, Cipher cipher) throws IOException { + if (Util.isNull(host, name, address, port)) throw new NullPointerException(); socket = new NamedContainer<>(false, new Socket(address, port)); this.host = host; this.name = name; this.writer = new PrintWriter(socket.get().getOutputStream(), true); - this.encryption = encryption; this.queue = new LinkedList>(); + this.cipher = (cipher != null)?cipher:new Cipher() { + @Override + public String getName() { + return "NONE"; + } + @Override + public byte[] encrypt(String key, JSONObject data) throws Exception { + return data.toString().getBytes(StandardCharsets.UTF_8); + } + @Override + public JSONObject decrypt(String key, byte[] data) throws Exception { + return new JSONObject(new String(data, StandardCharsets.UTF_8)); + } + }; if (!defaults) loadDefaults(); loop(); @@ -86,7 +93,12 @@ public final class SubDataClient { host.api.executeEvent(new SubNetworkConnectEvent(host.subdata)); } - private void loadDefaults() { + static { + addCipher("AES", new AES(128)); + addCipher("AES_128", new AES(128)); + addCipher("AES_192", new AES(192)); + addCipher("AES_256", new AES(256)); + } private void loadDefaults() { defaults = true; log = new Logger("SubData"); @@ -143,19 +155,8 @@ public final class SubDataClient { BufferedReader in = new BufferedReader(new InputStreamReader(socket.get().getInputStream())); String input; while ((input = in.readLine()) != null) { - String decoded = null; try { - switch (getEncryption()) { - case AES: - case AES_128: - case AES_192: - case AES_256: - decoded = AES.decrypt(host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)).get(); - break; - default: - decoded = new String(Base64.getDecoder().decode(input), StandardCharsets.UTF_8); - } - JSONObject json = new JSONObject(decoded); + JSONObject json = cipher.decrypt(host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)); for (PacketIn packet : decodePacket(json)) { try { packet.execute((json.keySet().contains("c"))?json.getJSONObject("c"):null); @@ -164,7 +165,7 @@ public final class SubDataClient { } } } catch (JSONException e) { - log.error.println(new IllegalPacketException("Unknown Packet Format: " + ((decoded == null || decoded.length() <= 0)?input:decoded))); + log.error.println(new IllegalPacketException("Unknown Packet Format: " + input)); } catch (IllegalPacketException e) { log.error.println(e); } catch (Exception e) { @@ -197,21 +198,52 @@ public final class SubDataClient { } /** - * Gets the Server Socket + * Gets the Client Socket * - * @return Server Socket + * @return Client Socket */ public Socket getClient() { return socket.get(); } /** - * Gets the Connection's Encryption method + * Add a Cipher for use by SubData * - * @return Encryption method + * @param cipher Cipher to Add + * @param handle Handle to Bind */ - public Encryption getEncryption() { - return encryption; + public static void addCipher(String handle, Cipher cipher) { + if (Util.isNull(cipher)) throw new NullPointerException(); + if (!ciphers.keySet().contains(handle.toLowerCase().replace('-', '_').replace(' ', '_'))) + ciphers.put(handle.toLowerCase().replace('-', '_').replace(' ', '_'), cipher); + } + + /** + * Gets the Ciphers + * + * @return Cipher Map + */ + public static Map getCiphers() { + return new TreeMap<>(ciphers); + } + + /** + * Gets the Client's Cipher + * + * @return Cipher + */ + public Cipher getCipher() { + return cipher; + } + + /** + * Gets a Cipher by Handle + * + * @param handle Handle + * @return Cipher + */ + public static Cipher getCipher(String handle) { + return getCiphers().get(handle.toLowerCase().replace('-', '_').replace(' ', '_')); } /** @@ -299,20 +331,7 @@ public final class SubDataClient { try { JSONObject json = encodePacket(packet.get()); if (packet.name() != null) json.put("f", packet.name()); - switch (getEncryption()) { - case AES: - case AES_128: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(128, host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_192: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(192, host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_256: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(256, host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - default: - writer.println(Base64.getEncoder().encodeToString(json.toString().getBytes(StandardCharsets.UTF_8))); - } + writer.println(Base64.getEncoder().encodeToString(cipher.encrypt(host.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json))); } catch (Throwable e) { log.error.println(e); } @@ -410,7 +429,7 @@ public final class SubDataClient { @Override public void run() { try { - host.subdata = new SubDataClient(host, name, socket.getInetAddress(), socket.getPort(), encryption); + host.subdata = new SubDataClient(host, name, socket.getInetAddress(), socket.getPort(), cipher); timer.cancel(); while (queue.size() != 0) { if (queue.get(0).name() != null) { diff --git a/SubServers.Sync/META-INF/MANIFEST.MF b/SubServers.Sync/META-INF/MANIFEST.MF index f8aa3f14..2d2f1746 100644 --- a/SubServers.Sync/META-INF/MANIFEST.MF +++ b/SubServers.Sync/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Sync.Launch Implementation-Version: 2.13a -Specification-Version: 1 +Specification-Version: 2 diff --git a/SubServers.Sync/src.jar b/SubServers.Sync/src.jar index fd0229e1..4342f913 100644 Binary files a/SubServers.Sync/src.jar and b/SubServers.Sync/src.jar differ diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Cipher.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Cipher.java new file mode 100644 index 00000000..94de1393 --- /dev/null +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Cipher.java @@ -0,0 +1,33 @@ +package net.ME1312.SubServers.Sync.Network; + +import org.json.JSONObject; + +/** + * SubData Cipher Layout Class + */ +public interface Cipher { + /** + * Get the name of this Cipher + * + * @return Cipher Name + */ + String getName(); + + /** + * Encrypt JSON Data + * + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array + */ + byte[] encrypt(String key, JSONObject data) throws Exception; + + /** + * Decrypt Encrypted JSON Data + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data + */ + JSONObject decrypt(String key, byte[] data) throws Exception; +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/AES.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Ciphers/AES.java similarity index 80% rename from SubServers.Host/src/net/ME1312/SubServers/Host/Network/AES.java rename to SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Ciphers/AES.java index 1d7f7b0d..e7ce550d 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/AES.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Ciphers/AES.java @@ -1,6 +1,6 @@ -package net.ME1312.SubServers.Host.Network; +package net.ME1312.SubServers.Sync.Network.Ciphers; -import net.ME1312.SubServers.Host.Library.NamedContainer; +import org.json.JSONObject; import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; @@ -16,8 +16,6 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidParameterSpecException; import java.security.spec.KeySpec; import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; import java.util.Random; /** @@ -31,7 +29,7 @@ import java.util.Random; * * @author dweymouth@gmail.com */ -public final class AES { +public final class AES implements net.ME1312.SubServers.Sync.Network.Cipher { // AES specification private static final String CIPHER_SPEC = "AES/CBC/PKCS5Padding"; @@ -45,6 +43,15 @@ public final class AES { // Process input/output streams in chunks private static final int BUFFER_SIZE = 1024; + // Hold Data for use by SubData Cipher methods + private final int keyLength; + + /** + * Constructor for use as a SubData Cipher + */ + public AES(int keyLength) { + this.keyLength = keyLength; + } /** * @return a new pseudorandom salt of the specified length @@ -165,37 +172,22 @@ public final class AES { } /** - * Encrypts a stream of data. The encrypted stream consists of a header - * followed by the raw AES data. The header is broken down as follows:
                                                                                    - *
                                                                                      - *
                                                                                    • keyLength: AES key length in bytes (valid for 16, 24, 32) (1 byte)
                                                                                      • - *
                                                                                    • salt: pseudorandom salt used to derive keys from password (16 bytes)
                                                                                      • - *
                                                                                    • authentication key (derived from password and salt, used to - * check validity of password upon decryption) (8 bytes)
                                                                                      • - *
                                                                                    • IV: pseudorandom AES initialization vector (16 bytes)
                                                                                      • - *
                                                                                    + * This method calls to {@link #encrypt(int, String, InputStream, OutputStream)}, simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. * - * @param keyLength - * key length to use for AES encryption (must be 128, 192, or 256) - * @param password - * password to use for encryption - * @param input - * an arbitrary string to encrypt - * @return - * string containing the encrypted data - * @throws AES.InvalidKeyLengthException - * if keyLength is not 128, 192, or 256 - * @throws AES.StrongEncryptionNotAvailableException - * if keyLength is 192 or 256, but the Java runtime's jurisdiction - * policy files do not allow 192- or 256-bit encryption - * @throws IOException + * @param key Key to Encrypt Data with + * @param data Data to Encrypt + * @return Encrypted Data Array */ - public static byte[] encrypt(int keyLength, String password, String input) throws IOException, StrongEncryptionNotAvailableException, InvalidKeyLengthException { + public byte[] encrypt(String key, JSONObject data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - encrypt(keyLength, password, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8)), bytes); + encrypt(keyLength, key, new ByteArrayInputStream(data.toString().getBytes(StandardCharsets.UTF_8)), bytes); return bytes.toByteArray(); } + public String getName() { + return "AES_" + keyLength; + } + /** * Decrypts a stream of data that was encrypted by {@link #encrypt}. * @param password @@ -270,25 +262,16 @@ public final class AES { } /** - * Decrypts a stream of data that was encrypted by {@link #encrypt}. - * @param password - * the password used to encrypt/decrypt the string - * @param input - * string of encrypted data to be decrypted - * @return the key length for the decrypted string (128, 192, or 256) and the string of decrypted data - * @throws AES.InvalidPasswordException - * if the given password was not used to encrypt the data - * @throws AES.InvalidAESStreamException - * if the given input stream is not a valid AES-encrypted stream - * @throws AES.StrongEncryptionNotAvailableException - * if the stream is 192 or 256-bit encrypted, and the Java runtime's - * jurisdiction policy files do not allow for AES-192 or 256 - * @throws IOException + * This method calls to {@link #decrypt(String, InputStream, OutputStream)}), simplified for the {@link net.ME1312.SubServers.Bungee.Network.Cipher} interface. + * + * @param key Key to Decrypt Data with + * @param data Encrypted Data Array + * @return JSON Data */ - public static NamedContainer decrypt(String password, byte[] input) throws IOException, StrongEncryptionNotAvailableException, InvalidAESStreamException, InvalidPasswordException { + public JSONObject decrypt(String key, byte[] data) throws Exception { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - int keyLength = decrypt(password, new ByteArrayInputStream(input), bytes); - return new NamedContainer<>(keyLength, new String(bytes.toByteArray(), StandardCharsets.UTF_8)); + decrypt(key, new ByteArrayInputStream(data), bytes); + return new JSONObject(new String(bytes.toByteArray(), StandardCharsets.UTF_8)); } /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java index 9e3825ba..1b8e80cb 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java @@ -6,6 +6,7 @@ import net.ME1312.SubServers.Sync.Library.Exception.IllegalPacketException; import net.ME1312.SubServers.Sync.Library.NamedContainer; import net.ME1312.SubServers.Sync.Library.Util; import net.ME1312.SubServers.Sync.Library.Version.Version; +import net.ME1312.SubServers.Sync.Network.Ciphers.AES; import net.ME1312.SubServers.Sync.Network.Packet.*; import net.ME1312.SubServers.Sync.Server.Server; import net.ME1312.SubServers.Sync.Server.SubServer; @@ -32,36 +33,42 @@ import java.util.concurrent.TimeUnit; public final class SubDataClient { private static HashMap, String> pOut = new HashMap, String>(); private static HashMap> pIn = new HashMap>(); + private static HashMap ciphers = new HashMap(); private static boolean defaults = false; private PrintWriter writer; private NamedContainer socket; - private Encryption encryption; + private Cipher cipher; private SubPlugin plugin; private LinkedList> queue; - public enum Encryption { - NONE, - AES, - AES_128, - AES_192, - AES_256 - } - /** * SubServers Client Instance * * @param plugin SubPlugin * @param address Address * @param port Port - * @param encryption Encryption Type + * @param cipher Cipher * @throws IOException */ - public SubDataClient(SubPlugin plugin, InetAddress address, int port, Encryption encryption) throws IOException { + public SubDataClient(SubPlugin plugin, InetAddress address, int port, Cipher cipher) throws IOException { if (Util.isNull(plugin, address, port)) throw new NullPointerException(); socket = new NamedContainer<>(false, new Socket(address, port)); this.plugin = plugin; this.writer = new PrintWriter(socket.get().getOutputStream(), true); - this.encryption = encryption; + this.cipher = (cipher != null)?cipher:new Cipher() { + @Override + public String getName() { + return "NONE"; + } + @Override + public byte[] encrypt(String key, JSONObject data) throws Exception { + return data.toString().getBytes(StandardCharsets.UTF_8); + } + @Override + public JSONObject decrypt(String key, byte[] data) throws Exception { + return new JSONObject(new String(data, StandardCharsets.UTF_8)); + } + }; this.queue = new LinkedList>(); if (!defaults) loadDefaults(); @@ -95,7 +102,12 @@ public final class SubDataClient { plugin.getPluginManager().callEvent(new SubNetworkConnectEvent(this)); } - private void loadDefaults() { + static { + addCipher("AES", new AES(128)); + addCipher("AES_128", new AES(128)); + addCipher("AES_192", new AES(192)); + addCipher("AES_256", new AES(256)); + } private void loadDefaults() { defaults = true; registerPacket(new PacketAuthorization(plugin), "Authorization"); @@ -133,19 +145,8 @@ public final class SubDataClient { BufferedReader in = new BufferedReader(new InputStreamReader(socket.get().getInputStream())); String input; while ((input = in.readLine()) != null) { - String decoded = null; try { - switch (getEncryption()) { - case AES: - case AES_128: - case AES_192: - case AES_256: - decoded = AES.decrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)).get(); - break; - default: - decoded = new String(Base64.getDecoder().decode(input), StandardCharsets.UTF_8); - } - JSONObject json = new JSONObject(decoded); + JSONObject json = cipher.decrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), Base64.getDecoder().decode(input)); for (PacketIn packet : decodePacket(json)) { try { packet.execute((json.keySet().contains("c")) ? json.getJSONObject("c") : null); @@ -154,7 +155,7 @@ public final class SubDataClient { } } } catch (JSONException e) { - new IllegalPacketException("Unknown Packet Format: " + ((decoded == null || decoded.length() <= 0) ? input : decoded)).printStackTrace(); + new IllegalPacketException("Unknown Packet Format: " + input).printStackTrace(); } catch (IllegalPacketException e) { e.printStackTrace(); } catch (Exception e) { @@ -187,12 +188,43 @@ public final class SubDataClient { } /** - * Gets the Connection's Encryption method + * Add a Cipher for use by SubData * - * @return Encryption method + * @param cipher Cipher to Add + * @param handle Handle to Bind */ - public Encryption getEncryption() { - return encryption; + public static void addCipher(String handle, Cipher cipher) { + if (Util.isNull(cipher)) throw new NullPointerException(); + if (!ciphers.keySet().contains(handle.toLowerCase().replace('-', '_').replace(' ', '_'))) + ciphers.put(handle.toLowerCase().replace('-', '_').replace(' ', '_'), cipher); + } + + /** + * Gets the Ciphers + * + * @return Cipher Map + */ + public static Map getCiphers() { + return new TreeMap<>(ciphers); + } + + /** + * Gets the Client's Cipher + * + * @return Cipher + */ + public Cipher getCipher() { + return cipher; + } + + /** + * Gets a Cipher by Handle + * + * @param handle Handle + * @return Cipher + */ + public static Cipher getCipher(String handle) { + return getCiphers().get(handle.toLowerCase().replace('-', '_').replace(' ', '_')); } /** @@ -280,20 +312,7 @@ public final class SubDataClient { try { JSONObject json = encodePacket(packet.get()); if (packet.name() != null) json.put("f", packet.name()); - switch (getEncryption()) { - case AES: - case AES_128: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(128, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_192: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(192, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - case AES_256: - writer.println(Base64.getEncoder().encodeToString(AES.encrypt(256, plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json.toString()))); - break; - default: - writer.println(Base64.getEncoder().encodeToString(json.toString().getBytes(StandardCharsets.UTF_8))); - } + writer.println(Base64.getEncoder().encodeToString(cipher.encrypt(plugin.config.get().getSection("Settings").getSection("SubData").getRawString("Password"), json))); } catch (Throwable e) { e.printStackTrace(); } @@ -391,7 +410,7 @@ public final class SubDataClient { @Override public void run() { try { - plugin.subdata = new SubDataClient(plugin, socket.getInetAddress(), socket.getPort(), encryption); + plugin.subdata = new SubDataClient(plugin, socket.getInetAddress(), socket.getPort(), cipher); timer.cancel(); while (queue.size() != 0) { if (queue.get(0).name() != null) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index f1045df9..9584b942 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -499,6 +499,7 @@ public final class SubCommand extends CommandX { private void updateTemplateCache() { if (Calendar.getInstance().getTime().getTime() - templateCache.name() >= TimeUnit.MINUTES.toMillis(5)) { + templateCache.rename(Calendar.getInstance().getTime().getTime()); plugin.subdata.sendPacket(new PacketDownloadServerList(null, null, (json) -> { TreeMap> hosts = new TreeMap>(); for (String host : json.getJSONObject("hosts").keySet()) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java index ccb1b2b8..c66518a0 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java @@ -8,6 +8,7 @@ import net.ME1312.SubServers.Sync.Library.NamedContainer; import net.ME1312.SubServers.Sync.Library.UniversalFile; import net.ME1312.SubServers.Sync.Library.Util; import net.ME1312.SubServers.Sync.Library.Version.Version; +import net.ME1312.SubServers.Sync.Network.Cipher; import net.ME1312.SubServers.Sync.Network.Packet.PacketDownloadServerInfo; import net.ME1312.SubServers.Sync.Network.SubDataClient; import net.ME1312.SubServers.Sync.Server.Server; @@ -90,15 +91,18 @@ public final class SubPlugin extends BungeeCord implements Listener { public void startListeners() { try { config.reload(); - SubDataClient.Encryption encryption = SubDataClient.Encryption.NONE; - if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { - System.out.println("SubData > Cannot encrypt connection without a password"); - } else if (Util.isException(() -> SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()))) { - System.out.println("SubData > Unknown encryption type: " + SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "None"))); - } else { - encryption = SubDataClient.Encryption.valueOf(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").replace('-', '_').replace(' ', '_').toUpperCase()); + + Cipher cipher = null; + if (!config.get().getSection("Settings").getSection("SubData").getRawString("Encryption", "NONE").equalsIgnoreCase("NONE")) { + if (config.get().getSection("Settings").getSection("SubData").getString("Password", "").length() == 0) { + System.out.println("SubData > Cannot encrypt connection without a password"); + } else if (!SubDataClient.getCiphers().keySet().contains(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption").toLowerCase().replace('-', '_').replace(' ', '_'))) { + System.out.println("SubData > Unknown encryption type: " + config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } else { + cipher = SubDataClient.getCipher(config.get().getSection("Settings").getSection("SubData").getRawString("Encryption")); + } } - subdata = new SubDataClient(this, InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[0]), Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[1]), encryption); + subdata = new SubDataClient(this, InetAddress.getByName(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[0]), Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getRawString("Address", "127.0.0.1:4391").split(":")[1]), cipher); super.startListeners(); if (!posted) {