diff --git a/libglusterfs/src/checksum.c b/libglusterfs/src/checksum.c
index acdaed04ae..9ec62b15ab 100644
--- a/libglusterfs/src/checksum.c
+++ b/libglusterfs/src/checksum.c
@@ -8,7 +8,7 @@
   cases as published by the Free Software Foundation.
 */
 
-#include <openssl/md5.h>
+#include <openssl/evp.h>
 #include <openssl/sha.h>
 #include <zlib.h>
 #include <stdint.h>
@@ -40,5 +40,13 @@ gf_rsync_strong_checksum(unsigned char *data, size_t len,
 void
 gf_rsync_md5_checksum(unsigned char *data, size_t len, unsigned char *md5)
 {
-    MD5(data, len, md5);
+    EVP_MD_CTX *mdctx;
+    // Use the MD5 digest algorithm
+    const EVP_MD *md = EVP_md5();
+
+    mdctx = EVP_MD_CTX_new();
+    EVP_DigestInit_ex(mdctx, md, NULL);
+    EVP_DigestUpdate(mdctx, data, len);
+    EVP_DigestFinal_ex(mdctx, md5, NULL);
+    EVP_MD_CTX_free(mdctx);
 }
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index dcdf60d843..a643a88971 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -598,7 +598,7 @@ gf_client_dump_fdtables(xlator_t *this)
                 clienttable->cliententries[count].next_free)
                 continue;
             client = clienttable->cliententries[count].client;
-            if (client->client_uid) {
+            if (client) {
                 gf_proc_dump_build_key(key, "conn", "%d.id", count);
                 gf_proc_dump_write(key, "%s", client->client_uid);
             }