* Default EncryptedStream format is now AES 256 CBC

src/EncryptedStream.c

@@ -2,6 +2,7 @@
  *
  */
 #include "base64.h"
+#include "misc.h"
 #include <bdlib/src/String.h>
 #include <bdlib/src/base64.h>
 #include "EncryptedStream.h"
@@ -35,46 +36,56 @@ int EncryptedStream::loadFile (const int fd) {
     }
   }
 
+  bd::String IV;
+
+  if (enc_flags & ENC_AES_256_CBC) {
+    IV = in_buf(0, 16);
+    in_buf += 16;
+  }
+
   if (enc_flags & ENC_KEEP_NEWLINES) {
     bd::String buf(in_buf), line, out_buf;
     while (buf.length()) {
       line = newsplit(buf, '\n');
-      unapply_filters(line);
+      unapply_filters(line, IV);
       line += '\n';
       out_buf += line;
     }
     in_buf = out_buf;
   } else {
-    unapply_filters(in_buf);
+    unapply_filters(in_buf, IV);
   }
 
   str = in_buf;
   return 0;
 }
 
-void EncryptedStream::apply_filters(bd::String& buf) const {
-#ifdef unimplemented
-  if (enc_flags & ENC_AES_256_CBC)
-    buf = encrypt_string_cbc(key, buf);
-#endif
-  if (enc_flags & ENC_AES_256_ECB)
+void EncryptedStream::apply_filters(bd::String& buf, const bd::String& IV) const {
+  if (enc_flags & ENC_AES_256_CBC) {
+    unsigned char* iv = (unsigned char*) strdup(IV.c_str());
+    buf = encrypt_string_cbc(key, buf, iv);
+    free(iv);
+  } else if (enc_flags & ENC_AES_256_ECB)
     buf = encrypt_string(key, buf);
+
   if (enc_flags & ENC_BASE64_BROKEN)
     buf = broken_base64Encode(buf);
   if (enc_flags & ENC_BASE64)
     buf = bd::base64Encode(buf);
 }
 
-void EncryptedStream::unapply_filters(bd::String& buf) const {
+void EncryptedStream::unapply_filters(bd::String& buf, const bd::String& IV) const {
   if (enc_flags & ENC_BASE64_BROKEN)
     buf = broken_base64Decode(buf);
   if (enc_flags & ENC_BASE64)
     buf = bd::base64Decode(buf);
-#ifdef unimplemented
-  if (enc_flags & ENC_AES_256_CBC)
-    buf = decrypt_string_cbc(key, buf);
-#endif
-  if (enc_flags & ENC_AES_256_ECB)
+
+  if (enc_flags & ENC_AES_256_CBC) {
+    unsigned char* iv = (unsigned char*) strdup(IV.c_str());
+    buf = decrypt_string_cbc(key, buf, iv);
+    free(iv);
+  }
+  else if (enc_flags & ENC_AES_256_ECB)
     buf = decrypt_string(key, buf);
 }
 
@@ -82,26 +93,35 @@ int EncryptedStream::writeFile (const int fd) const {
   if (!key.length()) return bd::Stream::writeFile(fd);
 
   /* Encrypt the stream before writing it out */
-  bd::String out_buf;
+  bd::String IV;
+  if (enc_flags & ENC_AES_256_CBC) {
+    char rand_string[17] = "";
+    make_rand_str(rand_string, sizeof(rand_string) - 1);
+    IV = bd::String(rand_string, 16);
+  }
 
+  bd::String out_buf;
   if (enc_flags & ENC_KEEP_NEWLINES) {
     bd::String buf(str), line;
     while (buf.length()) {
       line = newsplit(buf, '\n');
-      apply_filters(line);
+      apply_filters(line, IV);
       line += '\n';
       out_buf += line;
     }
 
   } else {
     out_buf = str;
-    apply_filters(out_buf);
+    apply_filters(out_buf, IV);
   }
 
   if (enc_flags & ENC_NO_HEADER)
     return bd::Stream(out_buf).writeFile(fd);
 
   const char encoding[3] = {0x7F, enc_flags, 0x7F};
-  bd::String encrypted = bd::String(encoding, 3) + out_buf;
+  bd::String encrypted(encoding, 3);
+  if (enc_flags & ENC_AES_256_CBC)
+    encrypted += IV;
+  encrypted += out_buf;
   return bd::Stream(encrypted).writeFile(fd);
 }

src/EncryptedStream.h

@@ -18,14 +18,14 @@ namespace bd {
 #define ENC_KEEP_NEWLINES	16
 #define ENC_NO_HEADER		32
 
-#define ENC_DEFAULT 		(ENC_AES_256_ECB)
+#define ENC_DEFAULT 		(ENC_AES_256_CBC)
 
 class EncryptedStream : public bd::Stream {
   private:
         bd::String key;
         mutable char enc_flags;
-        void apply_filters(bd::String& buf) const;
-        void unapply_filters(bd::String& buf) const;
+        void apply_filters(bd::String& buf, const bd::String& IV) const;
+        void unapply_filters(bd::String& buf, const bd::String& IV) const;
 
   protected: