From 4c5f55deefddfaeb2dfd3d2585ad1af31adac251 Mon Sep 17 00:00:00 2001
From: ys037 <ys037@hdm-stuttgart.de>
Date: Thu, 21 Dec 2023 19:37:05 +0100
Subject: [PATCH] Fix: decrypting of files (changed Algorithm Padding in
CryptoUtils.java) #60
---
.../Persistance/Classes/CryptoUtils.java | 7 ++++---
.../battlearena/Persistance/Classes/DBalt.java | 9 +++------
.../Persistance/Classes/OracleDB.java | 2 +-
src/main/resources/database/AzureDB_logindetails | Bin 111 -> 64 bytes
src/main/resources/database/document.encrypted | Bin 84 -> 48 bytes
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java
index a3ffe29d..97b3b626 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java
@@ -1,6 +1,7 @@
package de.hdm_stuttgart.battlearena.Persistance.Classes;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -18,11 +19,11 @@ import java.nio.charset.StandardCharsets;
public class CryptoUtils{
private static String parts[] = new String[2];
private static final String ALGORITHM = "AES";
- private static final String TRANSFORMATION = "AES";
+ private static final String TRANSFORMATION = "AES/ECB/PKCS5Padding";
/*public static void encrypt(String key, File inputFile, File outputFile)
throws CryptoException {
- doCrypto(Cipher.ENCRYPT_MODE, key, inputFile);
+ doCrypto(Cipher.ENCRYPT_MODE, key, inputFile,outputFile);
}*/
public static String[] decrypt(String key, File inputFile)
@@ -44,7 +45,7 @@ public class CryptoUtils{
byte[] outputBytes = cipher.doFinal(inputBytes);
String completeString = new String(outputBytes, StandardCharsets.UTF_8);
- System.out.println(completeString);
+ //System.out.println(completeString);
parts = completeString.split(";");
inputStream.close();
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java
index bff8f428..8f6ddfef 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java
@@ -24,12 +24,9 @@ public class DBalt implements IDataBasealt {
protected static void getlogindata() throws CryptoException {
parts = CryptoUtils.decrypt(key, encryptedFile);
- String completeString = parts[0] + parts[1];
- parts = completeString.split("=");
- user = parts[1];
- password = parts[2];
- user = user.replace("password", "");
- log.info("AzureDB_logindetails: user: " + user +" password: " + password);
+ user = parts[0];
+ password = parts[1];
+ log.info("AzureDB logindetails: user: " + user + " password: " + password);
}
private static final Logger log = LogManager.getLogger(DBalt.class);
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java
index 82006d89..c265529a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java
@@ -23,7 +23,7 @@ public class OracleDB implements ISQLDataBase {
//static File decryptedFile = new File("src\\main\\resources\\database\\document.decrypted");
private static final Logger log = LogManager.getLogger(OracleDB.class);
- public void getlogindata() throws CryptoException {
+ public static void getlogindata() throws CryptoException {
parts = CryptoUtils.decrypt(key, encryptedFile);
user = parts[0];
password = parts[1];
diff --git a/src/main/resources/database/AzureDB_logindetails b/src/main/resources/database/AzureDB_logindetails
index 1911780ef54a37f40c4b37e5f4a478f8c7874d28..444a71af54555cac318e7f97c9f186628cd9d16b 100644
GIT binary patch
literal 64
zcmV-G0Kfl=(R#4l=+PzXh+I4v+`%M$Hqf@~i<?-exGZ*+bKp|!7krXOM1_@DdJvIR
Weys-Ct_)H82uTMyL0p-u>oW^hxgRP3
literal 111
zcmXTTf4_e(5Q$${0wi54Z51K>cXQWh0a<lGEDXX7k`QqqdA1`?S_w#(z(wk0fJ_}A
ZzPtuV@B#6S-QjMWKpKt=fGj6Ab^zP3NFe|K
diff --git a/src/main/resources/database/document.encrypted b/src/main/resources/database/document.encrypted
index 4628fda970ac9930417a073c4bac11ac2cafdc69..837a9fbcf781d32fe5ecb8608ad6a314235ba395 100644
GIT binary patch
literal 48
zcmV-00MGv^1%~e?>!3~N0C{PaZl~7$p*RB0m>v*$v<63J980qjdfd<KybHwVF_VV{
Gd7K3&gBDQ$
literal 84
zcmdO7eZPM%5UByNFAy_SW&+7PAci9grgJmo1S)}iHup3cZy+sH1()Q8unZv-D@YY9
E0Is4mj{pDw
--
GitLab