Update for 85088c5

diff --git a/src/ecies.cpp b/src/ecies.cpp
index 4d72bfd..3f8eaf7 100644 (file)
--- a/src/ecies.cpp
+++ b/src/ecies.cpp
@@ -567,6 +567,7 @@ ies_ctx_t *create_context(EC_KEY *user_key)
     }
     catch (const std::bad_alloc& e) {
       printf("Error: %s in %s:%d\n", e.what(), __FILE__, __LINE__);
+// TODO: add checking to NULL where necessary
       return NULL;
     }
-}
+}
\ No newline at end of file

diff --git a/src/key.cpp b/src/key.cpp
index 49868b8..2232324 100644 (file)
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -1202,7 +1202,7 @@ void CKey::EncryptData(const std::vector<unsigned char>& data, std::vector<unsig
 
     cryptogram = ecies_encrypt(ctx, (unsigned char*)&data[0], data.size(), error);
     if (cryptogram == NULL) {
-        free(ctx);
+        delete ctx;
         ctx = NULL;
         throw key_error(std::string("Error in encryption: %s") + error);
     }
@@ -1211,7 +1211,7 @@ void CKey::EncryptData(const std::vector<unsigned char>& data, std::vector<unsig
     unsigned char *key_data = cryptogram_key_data(cryptogram);
     memcpy(&encrypted[0], key_data, encrypted.size());
     cryptogram_free(cryptogram);
-    free(ctx);
+    delete ctx;
 }
 
 void CKey::DecryptData(const std::vector<unsigned char>& encrypted, std::vector<unsigned char>& data)
@@ -1234,7 +1234,7 @@ void CKey::DecryptData(const std::vector<unsigned char>& encrypted, std::vector<
 
     decrypted = ecies_decrypt(ctx, cryptogram, &length, error);
     cryptogram_free(cryptogram);
-    free(ctx);
+    delete ctx;
 
     if (decrypted == NULL) {
         throw key_error(std::string("Error in decryption: %s") + error);
@@ -1243,4 +1243,4 @@ void CKey::DecryptData(const std::vector<unsigned char>& encrypted, std::vector<
     data.resize(length);
     memcpy(&data[0], decrypted, length);
     free(decrypted);
-}
+}
\ No newline at end of file