diff --git a/src/client.c b/src/client.c
index 5f5d15a..c1e2b38 100644
--- a/src/client.c
+++ b/src/client.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <arpa/inet.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
diff --git a/src/encrypt.c b/src/encrypt.c
index f576dd1..fbc8f63 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -199,7 +199,7 @@ int encrypt(char *key, char *in, int inl, char *out) {
 
 	int cipher_len = 0;
 
-	EVP_CIPHER_CTX *ctx = (EVP_CIPHER_CTX *) malloc(sizeof(EVP_CIPHER_CTX));
+	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
 
 	EVP_CIPHER_CTX_init(ctx);
 
@@ -229,7 +229,7 @@ int encrypt(char *key, char *in, int inl, char *out) {
 
 	free(cipher);
 
-	EVP_CIPHER_CTX_cleanup(ctx);
+	EVP_CIPHER_CTX_free(ctx);
 
 	return IV_SIZE + inl;
 
@@ -335,7 +335,7 @@ int decrypt(char *key, char *in, int inl, char *out) {
 
 	int outl = 0;
 
-	EVP_CIPHER_CTX *ctx = (EVP_CIPHER_CTX *) malloc(sizeof(EVP_CIPHER_CTX));
+	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
 
 	EVP_CIPHER_CTX_init(ctx);
 
@@ -349,7 +349,7 @@ int decrypt(char *key, char *in, int inl, char *out) {
 
 	free(cipher);
 
-	EVP_CIPHER_CTX_cleanup(ctx);
+	EVP_CIPHER_CTX_free(ctx);
 
 	if (cipher_len != outl) {