From d8a4970254ba32db072ff483b5b7560a10f877cc Mon Sep 17 00:00:00 2001
From: liudonghua <liudonghua123@gmail.com>
Date: Thu, 13 Jun 2024 03:09:55 +0000
Subject: [PATCH 1/2] add keyencoding support for encryption

---
 src/tools/encryption/encryption.vue | 45 +++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/tools/encryption/encryption.vue b/src/tools/encryption/encryption.vue
index 2ad47b51..288b572a 100644
--- a/src/tools/encryption/encryption.vue
+++ b/src/tools/encryption/encryption.vue
@@ -3,16 +3,22 @@ import { AES, RC4, Rabbit, TripleDES, enc } from 'crypto-js';
 import { computedCatch } from '@/composable/computed/catchedComputed';
 
 const algos = { AES, TripleDES, Rabbit, RC4 };
+type KeyEncoding = 'Text' | 'Hex';
 
 const cypherInput = ref('Lorem ipsum dolor sit amet');
 const cypherAlgo = ref<keyof typeof algos>('AES');
 const cypherSecret = ref('my secret key');
-const cypherOutput = computed(() => algos[cypherAlgo.value].encrypt(cypherInput.value, cypherSecret.value).toString());
+const cypherSecretEncoding = ref<KeyEncoding>('Text');
+const [cypherOutput, cypherError] = computedCatch(() => algos[cypherAlgo.value].encrypt(cypherInput.value, cypherSecretEncoding.value === 'Text' ? cypherSecret.value : enc.Hex.parse(cypherSecret.value), { iv: enc.Hex.parse('00000000000000000000000000000000') }).toString(), {
+  defaultValue: '',
+  defaultErrorMessage: 'Unable to cypher your text',
+});
 
 const decryptInput = ref('U2FsdGVkX1/EC3+6P5dbbkZ3e1kQ5o2yzuU0NHTjmrKnLBEwreV489Kr0DIB+uBs');
 const decryptAlgo = ref<keyof typeof algos>('AES');
 const decryptSecret = ref('my secret key');
-const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.value].decrypt(decryptInput.value, decryptSecret.value).toString(enc.Utf8), {
+const decryptSecretEncoding = ref<KeyEncoding>('Text');
+const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.value].decrypt(decryptInput.value, decryptSecretEncoding.value === 'Text' ? decryptSecret.value : enc.Hex.parse(decryptSecret.value), { iv: enc.Hex.parse('00000000000000000000000000000000') }).toString(enc.Utf8), {
   defaultValue: '',
   defaultErrorMessage: 'Unable to decrypt your text',
 });
@@ -31,6 +37,22 @@ const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.valu
       <div flex flex-1 flex-col gap-2>
         <c-input-text v-model:value="cypherSecret" label="Your secret key:" clearable raw-text />
 
+        <c-select
+          v-model:value="cypherSecretEncoding" label="Key encoding"
+          flex-1
+          placeholder="Select the key encoding..."
+          :options="[
+            {
+              label: 'Plain Text',
+              value: 'Text',
+            },
+            {
+              label: 'Hexadecimal Text',
+              value: 'Hex',
+            },
+          ]"
+        />
+
         <c-select
           v-model:value="cypherAlgo"
           label="Encryption algorithm:"
@@ -38,6 +60,9 @@ const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.valu
         />
       </div>
     </div>
+    <c-alert v-if="cypherError" type="error" mt-12 title="Error while cyphering">
+      {{ cypherError }}
+    </c-alert>
     <c-input-text
       label="Your text encrypted:"
       :value="cypherOutput"
@@ -58,6 +83,22 @@ const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.valu
       <div flex flex-1 flex-col gap-2>
         <c-input-text v-model:value="decryptSecret" label="Your secret key:" clearable raw-text />
 
+        <c-select
+          v-model:value="decryptSecretEncoding" label="Key encoding"
+          flex-1
+          placeholder="Select the key encoding..."
+          :options="[
+            {
+              label: 'Plain Text',
+              value: 'Text',
+            },
+            {
+              label: 'Hexadecimal Text',
+              value: 'Hex',
+            },
+          ]"
+        />
+
         <c-select
           v-model:value="decryptAlgo"
           label="Encryption algorithm:"

From 4fd536a5ff2ee92ba3b6ab3a6876975e74057fdd Mon Sep 17 00:00:00 2001
From: liudonghua <liudonghua123@gmail.com>
Date: Thu, 13 Jun 2024 03:33:08 +0000
Subject: [PATCH 2/2] use an empty iv, it's the same as the zero filled
 previously

---
 src/tools/encryption/encryption.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/encryption/encryption.vue b/src/tools/encryption/encryption.vue
index 288b572a..42113254 100644
--- a/src/tools/encryption/encryption.vue
+++ b/src/tools/encryption/encryption.vue
@@ -9,7 +9,7 @@ const cypherInput = ref('Lorem ipsum dolor sit amet');
 const cypherAlgo = ref<keyof typeof algos>('AES');
 const cypherSecret = ref('my secret key');
 const cypherSecretEncoding = ref<KeyEncoding>('Text');
-const [cypherOutput, cypherError] = computedCatch(() => algos[cypherAlgo.value].encrypt(cypherInput.value, cypherSecretEncoding.value === 'Text' ? cypherSecret.value : enc.Hex.parse(cypherSecret.value), { iv: enc.Hex.parse('00000000000000000000000000000000') }).toString(), {
+const [cypherOutput, cypherError] = computedCatch(() => algos[cypherAlgo.value].encrypt(cypherInput.value, cypherSecretEncoding.value === 'Text' ? cypherSecret.value : enc.Hex.parse(cypherSecret.value), { iv: enc.Hex.parse('') }).toString(), {
   defaultValue: '',
   defaultErrorMessage: 'Unable to cypher your text',
 });
@@ -18,7 +18,7 @@ const decryptInput = ref('U2FsdGVkX1/EC3+6P5dbbkZ3e1kQ5o2yzuU0NHTjmrKnLBEwreV489
 const decryptAlgo = ref<keyof typeof algos>('AES');
 const decryptSecret = ref('my secret key');
 const decryptSecretEncoding = ref<KeyEncoding>('Text');
-const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.value].decrypt(decryptInput.value, decryptSecretEncoding.value === 'Text' ? decryptSecret.value : enc.Hex.parse(decryptSecret.value), { iv: enc.Hex.parse('00000000000000000000000000000000') }).toString(enc.Utf8), {
+const [decryptOutput, decryptError] = computedCatch(() => algos[decryptAlgo.value].decrypt(decryptInput.value, decryptSecretEncoding.value === 'Text' ? decryptSecret.value : enc.Hex.parse(decryptSecret.value), { iv: enc.Hex.parse('') }).toString(enc.Utf8), {
   defaultValue: '',
   defaultErrorMessage: 'Unable to decrypt your text',
 });