From 8cfb65ccd764199b2aa32382bdea4f102695cf8d Mon Sep 17 00:00:00 2001
From: karmst <keith@belkast.com>
Date: Tue, 31 Dec 2024 08:39:10 -0500
Subject: [PATCH] New encryption routine

Added to make the encryption routine more robust
---
 src/com/belkast/soap/salter.java | 76 ++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/com/belkast/soap/salter.java

diff --git a/src/com/belkast/soap/salter.java b/src/com/belkast/soap/salter.java
new file mode 100644
index 0000000..53610d0
--- /dev/null
+++ b/src/com/belkast/soap/salter.java
@@ -0,0 +1,76 @@
+package com.belkast.soap;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.SecureRandom;
+import java.security.spec.KeySpec;
+import java.util.Base64;
+
+public class AES256 {
+
+    private static final int KEY_LENGTH = 256;
+    private static final int ITERATION_COUNT = 65536;
+
+    public static String encrypt(String strToEncrypt, String secretKey, String salt) {
+
+        try {
+
+            SecureRandom secureRandom = new SecureRandom();
+            byte[] iv = new byte[16];
+            secureRandom.nextBytes(iv);
+            IvParameterSpec ivspec = new IvParameterSpec(iv);
+
+            SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+            KeySpec spec = new PBEKeySpec(secretKey.toCharArray(), salt.getBytes(), ITERATION_COUNT, KEY_LENGTH);
+            SecretKey tmp = factory.generateSecret(spec);
+            SecretKeySpec secretKeySpec = new SecretKeySpec(tmp.getEncoded(), "AES");
+
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivspec);
+
+            byte[] cipherText = cipher.doFinal(strToEncrypt.getBytes("UTF-8"));
+            byte[] encryptedData = new byte[iv.length + cipherText.length];
+            System.arraycopy(iv, 0, encryptedData, 0, iv.length);
+            System.arraycopy(cipherText, 0, encryptedData, iv.length, cipherText.length);
+
+            return Base64.getEncoder().encodeToString(encryptedData);
+        } catch (Exception e) {
+            // Handle the exception properly
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String decrypt(String strToDecrypt, String secretKey, String salt) {
+
+        try {
+
+            byte[] encryptedData = Base64.getDecoder().decode(strToDecrypt);
+            byte[] iv = new byte[16];
+            System.arraycopy(encryptedData, 0, iv, 0, iv.length);
+            IvParameterSpec ivspec = new IvParameterSpec(iv);
+
+            SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+            KeySpec spec = new PBEKeySpec(secretKey.toCharArray(), salt.getBytes(), ITERATION_COUNT, KEY_LENGTH);
+            SecretKey tmp = factory.generateSecret(spec);
+            SecretKeySpec secretKeySpec = new SecretKeySpec(tmp.getEncoded(), "AES");
+
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivspec);
+
+            byte[] cipherText = new byte[encryptedData.length - 16];
+            System.arraycopy(encryptedData, 16, cipherText, 0, cipherText.length);
+
+            byte[] decryptedText = cipher.doFinal(cipherText);
+            return new String(decryptedText, "UTF-8");
+        } catch (Exception e) {
+            // Handle the exception properly
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
\ No newline at end of file