fix copyright in license

ez

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Geprivilegieerde Anonimiteit BV
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,7 +1,9 @@
 A multi-purpose Cryptography library in Java. Working on it day by day, slowly. Someday this will be complete, today is not that day.
 To be clear, this is **NOT** mean't to be a replacement/alternative to BouncyCastle. Instead, it is meant to include what BouncyCastle does not have. No code was taken from OpenSSL or BouncyCastle for that reason.
 
-### Current Objective: ZekerRijndael (custom encryption sub-library)
+We are (soon to be) DMCA-protected: https://www.dmca.com/r/8e2yr97
+
+Yes. We will advertise Microsoft products for free via variable names.
 
 Use `setopt interactivecomments` (zsh only) to allow using `#` for comments if you see errors like `zsh: command not found: #`
 
@@ -13,6 +15,6 @@ To compile (these commands should work universally):
 
 1. git clone https://github.com/Geprivilegieerde-Anonimiteit-BV/XACrypto.git # download the git repository
 2. cd XACrypto # enter the directory
-3. mvn clean package # compile the package cleanly
+3. mvn clean package # first clean the directory, then package it into a jar
 
-You should find the built jar at target/XACrypto-1.0-SNAPSHOT.jar
+You should find the built jar at target/xacrypto-\<version\>.jar

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>de.caydenno1.xacrypto</groupId>
     <artifactId>xacrypto</artifactId>
-    <version>2026.06.19_R1</version>
+    <version>2026.07.04_R1</version>
 
     <name>XACrypto</name>
     <description>A multi-purpose Cryptography library in Java.</description>
@@ -55,6 +55,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.16</version>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

src/main/java/de/caydenno1/xacrypto/hash/sha/SHA0.java

@@ -1,6 +1,8 @@
 package de.caydenno1.xacrypto.hash.sha;
 
 import de.caydenno1.xacrypto.misc.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.nio.charset.StandardCharsets;
 
@@ -8,9 +10,10 @@ import static de.caydenno1.xacrypto.hash.sha.Shared.INT2BYTE;
 import static de.caydenno1.xacrypto.hash.sha.Shared.hex;
 
 public class SHA0 {
-    // we really only need one file. very simple code
+    private static final Logger log = LoggerFactory.getLogger(SHA0.class);
+
     public static byte[] hash(byte[] data){
-        System.out.println("Beware, SHA0 is deprecated and cryptographically broken. Use at your own risk.");
+        log.warn("SHA0 is deprecated and cryptographically broken. Use at your own risk.");
         byte[] padded = Shared.pad(data);
 
         int a0 = Constants.SHA_H[0], a1 = Constants.SHA_H[1], a2 = Constants.SHA_H[2], a3 = Constants.SHA_H[3], a4 = Constants.SHA_H[4];

src/main/java/de/caydenno1/xacrypto/misc/XACryptoException.java

@@ -17,7 +17,7 @@ public class XACryptoException extends Exception {
     }
     public XACryptoException(String res, int iid) {
         super(res);
-        this.id = iid;
+        this.id = iid & 0xFF;
     }
     public XACryptoException(String[] pnts, byte id){
         super(String.join("|", pnts));

src/main/java/de/caydenno1/xacrypto/misc/isNull.java

@@ -10,13 +10,6 @@ public class isNull {
         return Objects.isNull(v) || v == null || v == alt;
     }
     public static boolean isValidText(String s) {
-        if (s.isBlank() || s.trim().isEmpty()) return false;
+        return !isNull(s) && !s.isBlank();
-        switch (s) {
-            case "":
-            case null:
-                return false;
-            default:
-                return true;
-        }
     };
 }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/Factories.java

@@ -7,36 +7,71 @@ import de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionle
 import de.caydenno1.xacrypto.zekerrijndael.GCM.AES;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.ciphers.*;
+import de.caydenno1.xacrypto.zekerrijndael.Global.Aria;
 import de.caydenno1.xacrypto.zekerrijndael.Global.Camellia;
-import java.lang.reflect.InvocationTargetException;
 
 public class Factories {
     public static class GCM {
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AES128(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AES(key, 128)); }
+        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AES128(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AES(key, 128)); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SM4GCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SM4GCM(key)); }
+        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SM4GCM(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SM4GCM(key)); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM Camellia(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Camellia(key)); }
+        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM Camellia(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Camellia(key)); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AESGCM() throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AESGCM()); }
+        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM ARIAGCM(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Aria(true, key)); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM ARIAGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new ARIAGCM(key)); }
+        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SerpentGCM(byte[] key) throws XACryptoException { return new SerpentGCM(key); }
-
-        public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SerpentGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SerpentGCM(key)); }
     }
 
+    private static volatile boolean ecbOptIn = false;
+
+    /**
+     * Enables the use of ECB mode.
+     *
+     * <p><strong>Warning:</strong> ECB mode is insecure for
+     * almost all applications because identical plaintext blocks
+     * produce identical ciphertext blocks, leaking data patterns.
+     *
+     * <p>This method exists solely for backwards compatibility.
+     * Prefer {@link Factories.GCM} or another secure encryption mode.
+     * The contributor that has written this wishes to remain anonymous.
+     */
+    public static void allowInsecureECB() {
+        ecbOptIn = true;
+    }
+
+    private static void checkECBenabled() throws XACryptoException {
+        if (!ecbOptIn) {
+        throw new XACryptoException(
+            "ECB mode is not secure because it can leak data patterns. Call Factories.allowInsecureECB() before using ECB."
+        );
+        }
+    }
+
+/**
+ * Provides ECB mode cipher factories.
+ *
+ * <p><strong>Warning:</strong> ECB mode is insecure because identical
+ * plaintext blocks produce identical ciphertext blocks, leaking data patterns.
+ *
+ * <p>This class requires opt-in using
+ * {@link Factories#allowInsecureECB()} and exists only for backwards compatibility.
+ *
+ * @deprecated Use GCM or another secure encryption mode instead.
+ */
+    @Deprecated
     public static class ECB {
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless Blowfish(byte[] key) throws XACryptoException { return new BlowfishECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless Blowfish(byte[] key) throws XACryptoException { checkECBenabled(); return new BlowfishECB(key); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Aria(byte[] key) throws XACryptoException { return new AriaECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Aria(byte[] key) throws XACryptoException { checkECBenabled(); return new AriaECB(key); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless SM4(byte[] key) throws XACryptoException { return new SM4ECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless SM4(byte[] key) throws XACryptoException { checkECBenabled(); return new SM4ECB(key); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB AES(byte[] key) throws XACryptoException { return new AESECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB AES(byte[] key) throws XACryptoException { checkECBenabled(); return new AESECB(key); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Twofish(byte[] key) throws XACryptoException { return new TwofishECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Twofish(byte[] key) throws XACryptoException { checkECBenabled(); return new TwofishECB(key); }
 
-        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB RC6ECB(byte[] key) throws XACryptoException { return new RC6ECB(key); }
+        public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB RC6ECB(byte[] key) throws XACryptoException { checkECBenabled(); return new RC6ECB(key); }
 
         //public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless CamelliaECB(byte[] key) throws XACryptoException { return new CamelliaECB(key); }
     }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java

@@ -1,28 +1,26 @@
 package de.caydenno1.xacrypto.zekerrijndael.GCM;
+
 import de.caydenno1.xacrypto.misc.ToM;
 import de.caydenno1.xacrypto.misc.XACryptoException;
 import de.caydenno1.xacrypto.misc.isNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Objects;
 
 public class GCM {
-    private final Object cip;
+    private static final Logger log = LoggerFactory.getLogger(GCM.class);
+    private final BlockCipher cip;
     private final GHASH gh;
-    private final Method encryptor;
 
-    public GCM(Object cip) throws XACryptoException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    public GCM(BlockCipher cip) throws XACryptoException {
         this.cip = cip;
-        this.encryptor = cip.getClass().getMethod("encryptBlock", byte[].class);
+        byte[] H = cip.encryptBlock(new byte[16]);
-
-        byte[] H = (byte[]) this.encryptor.invoke(cip, (Object) new byte[16]);
-
         this.gh = new GHASH(H);
     }
 
-    public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException {
       if (iv.length <= 0) throw new XACryptoException("iv does not have data or is corrupted :[");
       if (pln == null) pln = new byte[0];
       if (aad == null) aad = new byte[0];
@@ -38,23 +36,23 @@ public class GCM {
       return new Result(packaged,tag);
     }
     
-    public byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad) throws XACryptoException {
         return dec(res, aad, 12, false);
     }
 
-    public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException {
         return dec(res, aad, 12, Objects.equals(optflag, "-override"));
     }
 
-    public byte[] decrypt(Result res, byte[] aad, int ivLen) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad, int ivLen) throws XACryptoException {
         return dec(res, aad, ivLen, false);
     }
 
-    public byte[] decrypt(Result res, byte[] aad, int ivLen, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad, int ivLen, String optflag) throws XACryptoException {
         return dec(res, aad, ivLen, Objects.equals(optflag, "-override"));
     }
 
-    private byte[] dec(Result res, byte[] aad, int ivLen, boolean override) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    private byte[] dec(Result res, byte[] aad, int ivLen, boolean override) throws XACryptoException {
         if (res.cip().length < 12) throw new XACryptoException("ciptext min len is 12 char");
         if (isNull.isNull(aad)) aad = new byte[0];
 
@@ -69,7 +67,7 @@ public class GCM {
         if (!corr && !override) {
             throw new XACryptoException("GCM tag does not match. Use Flag -override to ignore this.",(byte)-1);
         } else if (!corr) {
-            System.out.println("GCM tag does not match. Overriding...");
+            log.warn("GCM tag does not match. Overriding...");
         }
 
         return gctr(inc32(J0), ct);
@@ -86,17 +84,17 @@ public class GCM {
         }
     }
 
-    private byte[] tag(byte[] aad, byte[] ct, byte[] J0) throws InvocationTargetException, IllegalAccessException {
+    private byte[] tag(byte[] aad, byte[] ct, byte[] J0) throws XACryptoException {
         byte[] S   = gh.compute(aad, ct);
-        byte[] EJ0 = (byte[]) this.encryptor.invoke(J0);
+        byte[] EJ0 = cip.encryptBlock(J0);
         for (int i = 0; i < 16; i++) S[i] ^= EJ0[i];
         return S;
     }
-    private byte[] gctr(byte[] icb, byte[] in) throws InvocationTargetException, IllegalAccessException {
+    private byte[] gctr(byte[] icb, byte[] in) throws XACryptoException {
         byte[] o = new byte[in.length];
         byte[] cnt = Arrays.copyOf(icb, 16);
         for (int i = 0 ; i < in.length ; i += 16){
-            byte[] ks = (byte[]) this.encryptor.invoke(cnt);
+            byte[] ks = cip.encryptBlock(cnt);
             int len = Math.min(16, in.length -i);
             for (int j = 0; j < len; j++) o[i + j] = (byte)(in[i + j] ^ ks[j]);
             if (i+16<in.length) cnt = inc32(cnt);

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java

@@ -4,6 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GHASH;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.AES;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
@@ -16,8 +18,10 @@ interface AESCipher {
 }
 
 public class AESGCM implements AESCipher {
+    private static final Logger log = LoggerFactory.getLogger(AESGCM.class);
+
     public Result encryptBlock(byte[] pln, byte[] key, byte[] nonce, byte[] aad) throws XACryptoException {
-        System.out.println("WARNING! AESGCM may not be fully functional and partially broken. I am unsure if it fully works or not.");
+        log.warn("AESGCM may not be fully functional and partially broken. I am unsure if it fully works or not.");
         AES aes = new AES(key, getKeySize(key));
         byte[] H = aes.encryptBlock(new byte[16]);
         GHASH gh = new GHASH(H);
@@ -82,7 +86,7 @@ public class AESGCM implements AESCipher {
         if (!ToM(tag, expectedTag) && !flag) {
             throw new XACryptoException("Tag does not match. USE flag \"-override\" to ignore this.");
         } else if (!ToM(tag,expectedTag) && flag) {
-            System.out.println("Continuing in insecure mode.");
+            log.warn("Continuing in insecure mode.");
         }
 
         return aes.encryptCTR(cip, J0);

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java

@@ -5,12 +5,10 @@ import de.caydenno1.xacrypto.zekerrijndael.Global.Aria;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.Result;
 
-import java.lang.reflect.InvocationTargetException;
-
 interface AriaCipher {
-    Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException;
+    Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException;
-    byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException;
+    byte[] decrypt(Result res, byte[] aad) throws XACryptoException;
-    byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException;
+    byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException;
 }
 
 public class ARIAGCM implements AriaCipher {
@@ -18,19 +16,19 @@ public class ARIAGCM implements AriaCipher {
     // i basically wrote the entire thing in Aria.java already lol. just inheriting it here
     private final GCM engine;
 
-    public ARIAGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+    public ARIAGCM(byte[] key) throws XACryptoException {
         Aria aria = new Aria(true, key);
         this.engine = new GCM(aria);
     }
 
-    public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException {
         return engine.encrypt(pln, aad,iv);
     }
 
-    public byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad) throws XACryptoException {
         return engine.decrypt(res, aad);
     }
-    public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
+    public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException {
         return engine.decrypt(res, aad, optflag);
     }
 }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/CamelliaGCM.java

@@ -4,10 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.Global.Camellia;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class CamelliaGCM extends GCM {
-    public CamelliaGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+    public CamelliaGCM(byte[] key) throws XACryptoException {
         super(new Camellia(key));
     }
 }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java

@@ -4,8 +4,6 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.Global.Serpent;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class SerpentGCM extends GCM {
-    public SerpentGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { super(new Serpent(key)); }
+    public SerpentGCM(byte[] key) throws XACryptoException { super(new Serpent(key)); }
 }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java

@@ -4,10 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.Global.Twofish;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class TwofishGCM extends GCM {
-    public TwofishGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+    public TwofishGCM(byte[] key) throws XACryptoException {
         super(new Twofish(key));
     }
 }

src/main/java/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java

@@ -1,9 +1,10 @@
 package de.caydenno1.xacrypto.zekerrijndael.Global;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
+import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
 import de.caydenno1.xacrypto.zekerrijndael.UnchangingData;
 
-public class Aria {
+public class Aria implements BlockCipher {
     // this is NOT a cipher, more or less and encryption type/method
     private final int round;
     private final byte[][] encRK;

src/main/java/de/caydenno1/xacrypto/zekerrijndael/Global/Camellia.java

@@ -1,6 +1,7 @@
 package de.caydenno1.xacrypto.zekerrijndael.Global;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
+import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
 import de.caydenno1.xacrypto.zekerrijndael.UnchangingData;
 import de.caydenno1.xacrypto.hash.ROT;
 
@@ -9,7 +10,7 @@ interface CamelliaCipher {
     byte[] decryptBlock(byte[] in);
 }
 
-public class Camellia implements CamelliaCipher {
+public class Camellia implements CamelliaCipher, BlockCipher {
     private final long[] subkeys;
 
     public Camellia(byte[] key) throws XACryptoException {
@@ -18,7 +19,7 @@ public class Camellia implements CamelliaCipher {
 	    genKeySchedule(key);
     }
 
-    public byte[] encryptBlock(byte[] in) {
+    public byte[] encryptBlock(byte[] in) throws XACryptoException {
         return encryptBlock(in, 0, new byte[16], 0);
     }
 

src/main/java/de/caydenno1/xacrypto/zekerrijndael/Global/Twofish.java

@@ -1,12 +1,13 @@
 package de.caydenno1.xacrypto.zekerrijndael.Global;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
+import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
 
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q0;
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q1;
 import static de.caydenno1.xacrypto.zekerrijndael.Global.LE32.*;
 
-public class Twofish {
+public class Twofish implements BlockCipher {
     private final int[] K = new int[40];
     private final int[] S;
     private final int kW;