Fixed #2, cleared the bug in sequence of encryption and hashing

nikhilr612 · Apr 7, 2018 · 8931a03 · 8931a03
1 parent d87bf21
commit 8931a03
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 105 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/minAR_jar/minAR.jar b/out/artifacts/minAR_jar/minAR.jar
diff --git a/src/io/minAR/core/Extractor.java b/src/io/minAR/core/Extractor.java
@@ -56,15 +56,12 @@ public void analyze(boolean compressed, boolean ENCRYPTED, boolean HASH, SecretK
             byte[] serialized_data = null;
             byte[] apparent_data = Files.readAllBytes(ar_file);
             if(HASH){
-                Analyzer.PairOfDisjointBytes bytes = Analyzer.split(64, apparent_data);
+                byte[] dec_apparent_data = Crypt.decrypt(apparent_data, secretKey);
+                Analyzer.PairOfDisjointBytes bytes = Analyzer.split(64, dec_apparent_data);
                 if(Hash.checkHash(bytes.bytes1, bytes.bytes2)){
-                    if(ENCRYPTED){
-                        serialized_data = Crypt.decrypt(bytes.bytes2, secretKey);
-                    } else {
-                        serialized_data = bytes.bytes2;
-                    }
+                    serialized_data = bytes.bytes2;
                 } else {
-                    throw new MalformedDataException("The file" + ar_file.toString() + "is damaged; identical data absent.... [ERR: Hashes do not match]");
+                    throw new MalformedDataException(ar_file);
                 }
             } else {
                 if(ENCRYPTED){  // When apparent data is encrypted
@@ -125,14 +122,14 @@ private File mkfile(String path){
     }
 
     private class MalformedDataException extends RuntimeException {
-        String string;
-        public MalformedDataException(String s) {
-            string = s;
+        String ar_file;
+        public MalformedDataException(Path path) {
+            ar_file = path.toString();
         }
 
         @Override
         public String getMessage() {
-            return string;
+            return "The file " + ar_file + " is damaged; identical data absent.... [ERR: Hashes do not match]";
         }
     }
 }