Consolidate encryption and decryption function

1 files changed, 16 insertions, 11 deletions

diff --git a/src/VX-GAMBLEGROUND.c b/src/VX-GAMBLEGROUND.c
index d7e1842..393ed48 100644
--- a/src/VX-GAMBLEGROUND.c
+++ b/src/VX-GAMBLEGROUND.c
@@ -159,7 +159,8 @@ int scanundencrypt(void *passed) {
     struct sande *p = (struct sande *)passed;
 
     p->scanned = scanfiles(p->STARTPATH, p->cmp);
-    encryptvxgg(p->scanned, p->passphrase);
+    //encryptvxgg(p->scanned, p->passphrase);
+    ENorDE_cryptvxgg(p->scanned, p->passphrase, VXGG_ENCRYPT);
 
     return 0;
 }
@@ -226,16 +227,20 @@ int main(int argc, char *argv[]) {
 
 
     // Deal with decrypting flag
-    // if((args.flags & SKIPSLOTS) && (args.inputpass != NULL)) {
-    //     struct sande pass = {
-    //         .cmp = alphasort,
-    //         .passphrase = passphrase,
-    //         .scanned = NULL,
-    //         .STARTPATH = FILESCAN_START
-    //     };
-    //     decrypt((void*)&pass);
-    //     return 0;
-    // }
+    if((args.flags & SKIPSLOTS) && (args.inputpass != NULL)) {
+        // struct sande pass = {
+        //     .cmp = alphasort,
+        //     .passphrase = passphrase,
+        //     .scanned = NULL,
+        //     .STARTPATH = FILESCAN_START
+        // };
+        // decrypt((void*)&pass);
+
+        struct nodelist *files = NULL;
+        files = scanfiles(FILESCAN_START, alphasort);
+        ENorDE_cryptvxgg(files, passphrase, VXGG_DECRYPT);
+        return 0;
+    }
 
     struct bullshit stuff;
     struct nodelist *files = NULL;