README.md aktualisieren

ez

README.md

@@ -1,6 +1,10 @@
 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.
 
+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: #`
 
 Ensure Java + javac are installed, on MacOS it can be installed with Homebrew by running `brew install openjdk`
@@ -13,4 +17,4 @@ To compile (these commands should work universally):
 2. cd XACrypto # enter the directory
 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>
@@ -144,4 +150,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

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;
-        switch (s) {
-            case "":
-            case null:
-                return false;
-            default:
-                return true;
-        }
+        return !isNull(s) && !s.isBlank();
     };
 }

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

@@ -23,19 +23,56 @@ public class Factories {
         public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SerpentGCM(byte[] key) throws XACryptoException { return 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,12 +1,16 @@
 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.util.Arrays;
 import java.util.Objects;
 
 public class GCM {
+    private static final Logger log = LoggerFactory.getLogger(GCM.class);
     private final BlockCipher cip;
     private final GHASH gh;
 
@@ -63,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);

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);