X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fcrypto%2Fblowfish_crypto.cpp;h=f5f7681bd045f8ca988d900182a55360c3cd53d5;hb=56a8b71bcfe324f83044a12738004151ff2fc064;hp=1e8ee443c562e7fc36f25f68a4645ea1e53580e7;hpb=3ea085ec301ed1399dfa1e9f3a240312dc95410b;p=feisty_meow.git

diff --git a/nucleus/library/crypto/blowfish_crypto.cpp b/nucleus/library/crypto/blowfish_crypto.cpp
index 1e8ee443..f5f7681b 100644
--- a/nucleus/library/crypto/blowfish_crypto.cpp
+++ b/nucleus/library/crypto/blowfish_crypto.cpp
@@ -38,15 +38,20 @@ const int FUDGE = 128;
   // the cipher block size, but we ensure there will definitely be no
   // problems.
 
-#undef set_key
+//#undef set_key
   // get rid of a macro we don't want.
 
-#undef LOG
-#define LOG(t) CLASS_EMERGENCY_LOG(program_wide_logger::get(), t)
-
 //#define DEBUG_BLOWFISH
   // uncomment for noisier version.
 
+#ifdef DEBUG_BLOWFISH
+  #undef LOG
+  #define LOG(t) CLASS_EMERGENCY_LOG(program_wide_logger::get(), t)
+#else
+  #undef LOG
+  #define LOG(t) 
+#endif
+
 #ifdef DEBUG_BLOWFISH
   // this macro checks on the validity of the key sizes (in bits).
   #define DISCUSS_KEY_SIZE(key_size) \
@@ -78,37 +83,51 @@ blowfish_crypto::blowfish_crypto(int key_size)
 : _key_size(key_size),
   _key(new byte_array)
 {
-//  FUNCDEF("constructor [int]");
+  FUNCDEF("ctor(int)");
   static_ssl_initializer();
+  LOG("prior to key size discuss");
   DISCUSS_KEY_SIZE(key_size);
   if (key_size < minimum_key_size())
     _key_size = minimum_key_size();
   if (key_size > maximum_key_size())
     _key_size = maximum_key_size();
+  LOG("prior to generate key");
   generate_key(_key_size, *_key);
+  LOG("after generate key");
 }
 
 blowfish_crypto::blowfish_crypto(const byte_array &key, int key_size)
 : _key_size(key_size),
   _key(new byte_array(key))
 {
-//  FUNCDEF("constructor [byte_array/int]");
+  FUNCDEF("ctor(byte_array,int)");
   // any problems with the key provided are horrid.  they will yield a
   // non-working blowfish object.
+  LOG("prior to key size discuss");
   DISCUSS_KEY_SIZE(key_size);
+  LOG("prior to provided key discuss");
   DISCUSS_PROVIDED_KEY(key_size, key);
+  LOG("prior to ssl static init");
   static_ssl_initializer();
+  LOG("after ssl static init");
 }
 
 blowfish_crypto::blowfish_crypto(const blowfish_crypto &to_copy)
 : root_object(),
   _key_size(to_copy._key_size),
   _key(new byte_array(*to_copy._key))
-{ static_ssl_initializer(); }
+{
+  FUNCDEF("copy ctor");
+  static_ssl_initializer(); 
+  LOG("after ssl static init");
+}
 
 blowfish_crypto::~blowfish_crypto()
 {
+  FUNCDEF("dtor");
+  LOG("prior to key whack");
   WHACK(_key);
+  LOG("after key whack");
 }
 
 int blowfish_crypto::key_size() const { return _key_size; }
@@ -129,7 +148,7 @@ blowfish_crypto &blowfish_crypto::operator = (const blowfish_crypto &to_copy)
 
 bool blowfish_crypto::set_key(const byte_array &new_key, int key_size)
 {
-//  FUNCDEF("set_key");
+  FUNCDEF("set_key");
   if (!new_key.length()) return false;
   DISCUSS_KEY_SIZE(key_size);
   DISCUSS_PROVIDED_KEY(key_size, new_key);
@@ -143,7 +162,7 @@ bool blowfish_crypto::set_key(const byte_array &new_key, int key_size)
 
 void blowfish_crypto::generate_key(int size, byte_array &new_key)
 {
-//  FUNCDEF("generate_key");
+  FUNCDEF("generate_key");
   DISCUSS_KEY_SIZE(size);
   if (size < minimum_key_size())
     size = minimum_key_size();
@@ -160,14 +179,18 @@ SAFE_STATIC(mutex, __vector_init_lock, )
 
 const byte_array &blowfish_crypto::init_vector()
 {
+  FUNCDEF("init_vector");
   auto_synchronizer locking(__vector_init_lock());
   static byte_array to_return(EVP_MAX_IV_LENGTH);
   static bool initted = false;
+  LOG("prior to initted check");
   if (!initted) {
+    LOG("actually doing init");
     for (int i = 0; i < EVP_MAX_IV_LENGTH; i++)
       to_return[i] = 214 - i;
     initted = true;
   }
+  LOG("leaving init check");
   return to_return;
 }
 
@@ -180,18 +203,19 @@ bool blowfish_crypto::encrypt(const byte_array &source,
   bool to_return = true;
 
   // initialize an encoding session.
-  EVP_CIPHER_CTX session;
-  EVP_CIPHER_CTX_init(&session);
-  EVP_EncryptInit_ex(&session, EVP_bf_cbc(), NIL, _key->observe(),
+  EVP_CIPHER_CTX *session = EVP_CIPHER_CTX_new();
+
+  EVP_CIPHER_CTX_init(session);
+  EVP_EncryptInit_ex(session, EVP_bf_cbc(), NULL_POINTER, _key->observe(),
       init_vector().observe());
-  EVP_CIPHER_CTX_set_key_length(&session, _key_size);
+  EVP_CIPHER_CTX_set_key_length(session, _key_size);
 
   // allocate temporary space for encrypted data.
   byte_array encoded(source.length() + FUDGE);
 
   // encrypt the entire source buffer.
   int encoded_len = 0;
-  int enc_ret = EVP_EncryptUpdate(&session, encoded.access(), &encoded_len,
+  int enc_ret = EVP_EncryptUpdate(session, encoded.access(), &encoded_len,
       source.observe(), source.length());
   if (enc_ret != 1) {
     continuable_error(class_name(), func, a_sprintf("encryption failed, "
@@ -199,7 +223,7 @@ bool blowfish_crypto::encrypt(const byte_array &source,
     to_return = false;
   } else {
     // chop any extra space off.
-//    LOG(a_sprintf("encrypting bytes %d to %d.\n", i, edge));
+    LOG(a_sprintf("chopping bytes %d to %d.\n", encoded_len, encoded.last()));
     encoded.zap(encoded_len, encoded.last());
     target = encoded;
   }
@@ -209,19 +233,20 @@ bool blowfish_crypto::encrypt(const byte_array &source,
     // finalize the encryption.
     encoded.reset(FUDGE);  // reinflate for padding.
     int pad_len = 0;
-    enc_ret = EVP_EncryptFinal_ex(&session, encoded.access(), &pad_len);
+    enc_ret = EVP_EncryptFinal_ex(session, encoded.access(), &pad_len);
     if (enc_ret != 1) {
       continuable_error(class_name(), func, a_sprintf("finalizing encryption "
           "failed, result=%d.", enc_ret));
       to_return = false;
     } else {
-//      LOG(a_sprintf("padding added %d bytes.\n", pad_len));
+      LOG(a_sprintf("padding added %d bytes.\n", pad_len));
       encoded.zap(pad_len, encoded.last());
       target += encoded;
     }
   }
 
-  EVP_CIPHER_CTX_cleanup(&session);
+  EVP_CIPHER_CTX_cleanup(session);
+  EVP_CIPHER_CTX_free(session);
   return to_return;
 }
 
@@ -232,24 +257,24 @@ bool blowfish_crypto::decrypt(const byte_array &source,
   target.reset();
   if (!_key->length() || !source.length()) return false;
   bool to_return = true;
-  EVP_CIPHER_CTX session;
-  EVP_CIPHER_CTX_init(&session);
-//LOG(a_sprintf("key size %d bits.\n", BITS_PER_BYTE * _key->length()));
-  EVP_DecryptInit_ex(&session, EVP_bf_cbc(), NIL, _key->observe(),
+  EVP_CIPHER_CTX *session = EVP_CIPHER_CTX_new();
+  EVP_CIPHER_CTX_init(session);
+  LOG(a_sprintf("key size %d bits.\n", BITS_PER_BYTE * _key->length()));
+  EVP_DecryptInit_ex(session, EVP_bf_cbc(), NULL_POINTER, _key->observe(),
       init_vector().observe());
-  EVP_CIPHER_CTX_set_key_length(&session, _key_size);
+  EVP_CIPHER_CTX_set_key_length(session, _key_size);
 
   // allocate enough space for decoded bytes.
   byte_array decoded(source.length() + FUDGE);
 
   int decoded_len = 0;
-  int dec_ret = EVP_DecryptUpdate(&session, decoded.access(), &decoded_len,
+  int dec_ret = EVP_DecryptUpdate(session, decoded.access(), &decoded_len,
       source.observe(), source.length());
   if (dec_ret != 1) {
     continuable_error(class_name(), func, "decryption failed.");
     to_return = false;
   } else {
-//    LOG(a_sprintf("  decrypted size in bytes is %d.\n", decoded_len));
+    LOG(a_sprintf("  decrypted size in bytes is %d.\n", decoded_len));
     decoded.zap(decoded_len, decoded.last());
     target = decoded;
   }
@@ -258,8 +283,8 @@ bool blowfish_crypto::decrypt(const byte_array &source,
   if (dec_ret == 1) {
     decoded.reset(FUDGE);  // reinflate for padding.
     int pad_len = 0;
-    dec_ret = EVP_DecryptFinal_ex(&session, decoded.access(), &pad_len);
-//    LOG(a_sprintf("padding added %d bytes.\n", pad_len));
+    dec_ret = EVP_DecryptFinal_ex(session, decoded.access(), &pad_len);
+    LOG(a_sprintf("padding added %d bytes.\n", pad_len));
     if (dec_ret != 1) {
       continuable_error(class_name(), func, a_sprintf("finalizing decryption "
           "failed, result=%d, padlen=%d, target had %d bytes.", dec_ret,
@@ -272,7 +297,8 @@ bool blowfish_crypto::decrypt(const byte_array &source,
     }
   }
 
-  EVP_CIPHER_CTX_cleanup(&session);
+  EVP_CIPHER_CTX_cleanup(session);
+  EVP_CIPHER_CTX_free(session);
   return to_return;
 }