1 files changed, 18 insertions, 63 deletions

diff --git a/src/encryption.c b/src/encryption.c
index 32a5ce0..e4fed1f 100644
--- a/src/encryption.c
+++ b/src/encryption.c
@@ -19,7 +19,11 @@
 #if defined ___VXGG___ALWAYS_CHECK_LIBSODIUM___ && ___VXGG___ALWAYS_CHECK_LIBSODIUM___ > 0
 void naclfaildefault(void *none) {
     none = none; // Makes gcc happy    
-    error(1, ENOTSUP, "Couldn't initialize sodium for some reason. Quitting...");
+    #if defined ___VXGG___VERBOSE_ERRORS___ && ___VXGG___VERBOSE_ERRORS___ > 0
+        error(1, ENOTSUP, "Couldn't initialize sodium for some reason. Quitting...");
+    #else
+        exit(EXIT_FAILURE);
+    #endif
 }
 
 int checksodiumcb(const vxgg_naclfailcb callback, void *data) {
@@ -49,7 +53,11 @@ void checksodium(void) {
         checksodiumcb(NULL, NULL);
     #else
         if(sodium_init() < 0)
-            error(1, ENOTSUP, "Couldn't initialize sodium for some reason. Quitting...");
+            #if defined ___VXGG___VERBOSE_ERRORS___ && ___VXGG___VERBOSE_ERRORS___ > 0
+                error(1, ENOTSUP, "Couldn't initialize sodium for some reason. Quitting...");
+            #else
+                exit(EXIT_FAILURE);
+            #endif
     #endif
     
     return;
@@ -75,25 +83,12 @@ int maketmp(const char * const dest) {
     return open(dest, (O_TMPFILE | O_WRONLY | O_CLOEXEC | O_SYNC), (S_IRUSR | S_IWUSR));
 }
 
-int encrypttotmp(const char * const toencrypt) {
+int encrypttotmp(const char * const target, const char * const output, const char * const password, int chunksize) {
     #if defined ___VXGG___ALWAYS_CHECK_LIBSODIUM___ && ___VXGG___ALWAYS_CHECK_LIBSODIUM___ > 0
         checksodium();
     #endif
 
-    struct stat esb;
-    int efd = -1;
-
-    // Make sure the file is real and an actual file that can be encrypted
-    if(stat(toencrypt, &esb) < 0)
-        return -1;
-    if(!S_ISREG(esb.st_mode))
-        return -2;
-
-    // Open the file as read-only
-    if((efd = open(toencrypt, O_RDONLY)) < 0)
-        return -3;
-
-    // Need to get a secret key from a password and then set up cryptostream from libsodium
+    
 
     return 0;
 }
@@ -136,7 +131,11 @@ void* xsodium_malloc(size_t size) {
     void *mem = sodium_malloc(size);
     if(mem == NULL) {
         #if defined ___VXGG___XALLOC_EXIT_ON_ERROR___ && ___VXGG___XALLOC_EXIT_ON_ERROR___ > 0
-            error(1, errno, "xsodium_malloc: could not allocate memory... Quitting");
+            #if defined ___VXGG___VERBOSE_ERRORS___ && ___VXGG___VERBOSE_ERRORS___ > 0
+                error(1, errno, "<xsodium_malloc> could not allocate memory... Quitting");
+            #else
+                exit(EXIT_FAILURE);
+            #endif
         #endif
 
         abort();
@@ -218,7 +217,7 @@ int main(void) {
 
     //*///
 
-    //*// Example code for generating a key from a password and encrypting a test file
+    /*// Example code for generating a key from a password and encrypting a test file
 
     const char *dir = ".", *fname = "toBeEncrypted.test.txt", *pass = "this is a password";
     char *path = NULL, *message = NULL, *efname = NULL;
@@ -302,50 +301,6 @@ int main(void) {
     free(buf);
     free(cbuf);
 
-
-    // Ok now decryption to make sure I didn't fuck it
-    unsigned char dheader[crypto_secretstream_xchacha20poly1305_HEADERBYTES];
-    crypto_secretstream_xchacha20poly1305_state dstate;
-
-    if((fd = open(efname, O_RDONLY)) < 0)
-        error(1, errno, "Could not open file for decryption");
-    if((tfd = open("lmao.test.dec", O_WRONLY | O_CREAT | O_TRUNC, (S_IRUSR | S_IWUSR))) < 0)
-        error(1, errno, "Could not open file for result of decryption");
-
-    if(read(fd, header, sizeof(header)) < 0)
-        error(1, errno, "Could not read header of encrypted file");
-
-    if(crypto_secretstream_xchacha20poly1305_init_pull(&dstate, dheader, key) != 0)
-        error(1, EINVAL, "Incomplete header");
-
-    bytesread = -1;
-    unsigned char tag = 255;
-    buf = xcalloc(CHUNK_SIZE + 1, sizeof(*buf));
-    cbuf = xcalloc((CHUNK_SIZE + 1) + crypto_secretstream_xchacha20poly1305_ABYTES, sizeof(*cbuf));
-    while((bytesread = read(fd, cbuf, (CHUNK_SIZE + 1) + crypto_secretstream_xchacha20poly1305_ABYTES)) >= 0) {
-        if(crypto_secretstream_xchacha20poly1305_pull(&dstate, buf, NULL, &tag, cbuf, bytesread, NULL, 0) < 0)
-            error(1, errno, "Found a corrupted chunk");
-
-        if(tag == crypto_secretstream_xchacha20poly1305_TAG_FINAL && bytesread != 0)
-            error(1, errno, "End tag before end of file");
-
-        if(bytesread == 0 && tag != crypto_secretstream_xchacha20poly1305_TAG_FINAL)
-            error(1, errno, "End of file before end tag");
-
-        if(writewholebuffer(tfd, buf, bytesread) < 0)
-            error(1, errno, "write() error");
-
-        if(bytesread == 0)
-            break;
-    }
-    if(bytesread < 0)
-        error(1, errno, "read() error");
-
-    close(fd);
-    close(tfd);
-    free(buf);
-    free(cbuf);
-
     //*///
 
     return 0;