diff --git a/ssl/bigint.c b/ssl/bigint.c
index 24e6a53f8..b525069a3 100644
--- a/ssl/bigint.c
+++ b/ssl/bigint.c
@@ -1068,7 +1068,7 @@ static bigint *alloc(BI_CTX *ctx, int size)
     {
         /* No free bigints available - create a new one. */
         biR = (bigint *)malloc(sizeof(bigint));
-        biR->comps = (comp*) malloc(size * COMP_BYTE_SIZE);
+        biR->comps = (comp*)malloc(size * COMP_BYTE_SIZE);
         biR->max_comps = size;  /* give some space to spare */
     }
 
diff --git a/ssl/crypto_misc.c b/ssl/crypto_misc.c
index 4d5ebd4ab..2455e27c0 100644
--- a/ssl/crypto_misc.c
+++ b/ssl/crypto_misc.c
@@ -50,7 +50,7 @@ const char * const unsupported_str = "Error: feature not supported\n";
 BUF_MEM buf_new()
 {
     BUF_MEM bm;
-    bm.pre_data = (uint8_t *)malloc(2048); /* should be enough to start with */
+    bm.pre_data = (uint8_t *)calloc(1, 2048); /* start with this */
     bm.data = bm.pre_data+BM_RECORD_OFFSET; /* some space at the start */
     bm.max_len = 2048-BM_RECORD_OFFSET;
     bm.index = 0;
diff --git a/ssl/md5.c b/ssl/md5.c
index 87dfa04ed..b069011b7 100644
--- a/ssl/md5.c
+++ b/ssl/md5.c
@@ -54,7 +54,8 @@ static uint8_t PADDING[64] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-/* F, G, H and I are basic MD5 functions.  */
+/* F, G, H and I are basic MD5 functions.
+ */
 #define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
 #define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
 #define H(x, y, z) ((x) ^ (y) ^ (z))
@@ -113,10 +114,11 @@ void MD5Update(MD5_CTX *ctx, const uint8_t * msg, int len)
     x = (uint32_t)((ctx->count[0] >> 3) & 0x3F);
 
     /* Update number of bits */
-    if ((ctx->count[0] += ((uint32_t)len << 3)) < ((uint32_t)len << 3))
+    if ((ctx->count[0] += ((uint32_t)len << 3))
+            < ((uint32_t)len << 3))
         ctx->count[1]++;
-
     ctx->count[1] += ((uint32_t)len >> 29);
+
     partLen = 64 - x;
 
     /* Transform as many times as possible.  */
@@ -126,9 +128,7 @@ void MD5Update(MD5_CTX *ctx, const uint8_t * msg, int len)
         MD5Transform(ctx->state, ctx->buffer);
 
         for (i = partLen; i + 63 < len; i += 64)
-        {
             MD5Transform(ctx->state, &msg[i]);
-        }
 
         x = 0;
     }
@@ -145,104 +145,105 @@ void MD5Update(MD5_CTX *ctx, const uint8_t * msg, int len)
 void MD5Final(MD5_CTX *ctx, uint8_t *digest)
 {
     uint8_t bits[8];
-    uint32_t x, padlen;
+    uint32_t x, padLen;
 
-    /* save number of bits */
-    encode(bits, ctx->count, 8);
+    /* Save number of bits */
+    Encode(bits, ctx->count, 8);
 
-    /* pad out to 56 mod 64.  */
+    /* Pad out to 56 mod 64.
+     */
     x = (uint32_t)((ctx->count[0] >> 3) & 0x3f);
-    padlen = (x < 56) ? (56 - x) : (120 - x);
-    md5update(ctx, padding, padlen);
+    padLen = (x < 56) ? (56 - x) : (120 - x);
+    MD5Update(ctx, PADDING, padLen);
 
-    /* append length (before padding) */
-    md5update(ctx, bits, 8);
+    /* Append length (before padding) */
+    MD5Update(ctx, bits, 8);
 
-    /* store state in digest */
-    encode(digest, ctx->state, md5_size);
+    /* Store state in digest */
+    Encode(digest, ctx->state, MD5_SIZE);
 }
 
 /**
- * md5 basic transformation. transforms state based on block.
+ * MD5 basic transformation. Transforms state based on block.
  */
-static void md5transform(uint32_t state[4], const uint8_t block[64])
+static void MD5Transform(uint32_t state[4], const uint8_t block[64])
 {
     uint32_t a = state[0], b = state[1], c = state[2], 
-             d = state[3], x[md5_size];
+             d = state[3], x[MD5_SIZE];
 
-    decode(x, block, 64);
+    Decode(x, block, 64);
 
-    /* round 1 */
-    ff(a, b, c, d, x[ 0], s11, 0xd76aa478); /* 1 */
-    ff(d, a, b, c, x[ 1], s12, 0xe8c7b756); /* 2 */
-    ff(c, d, a, b, x[ 2], s13, 0x242070db); /* 3 */
-    ff(b, c, d, a, x[ 3], s14, 0xc1bdceee); /* 4 */
-    ff(a, b, c, d, x[ 4], s11, 0xf57c0faf); /* 5 */
-    ff(d, a, b, c, x[ 5], s12, 0x4787c62a); /* 6 */
-    ff(c, d, a, b, x[ 6], s13, 0xa8304613); /* 7 */
-    ff(b, c, d, a, x[ 7], s14, 0xfd469501); /* 8 */
-    ff(a, b, c, d, x[ 8], s11, 0x698098d8); /* 9 */
-    ff(d, a, b, c, x[ 9], s12, 0x8b44f7af); /* 10 */
-    ff(c, d, a, b, x[10], s13, 0xffff5bb1); /* 11 */
-    ff(b, c, d, a, x[11], s14, 0x895cd7be); /* 12 */
-    ff(a, b, c, d, x[12], s11, 0x6b901122); /* 13 */
-    ff(d, a, b, c, x[13], s12, 0xfd987193); /* 14 */
-    ff(c, d, a, b, x[14], s13, 0xa679438e); /* 15 */
-    ff(b, c, d, a, x[15], s14, 0x49b40821); /* 16 */
+    /* Round 1 */
+    FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+    FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+    FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+    FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+    FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+    FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+    FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+    FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+    FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+    FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+    FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+    FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+    FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+    FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+    FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+    FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
 
-    /* round 2 */
-    gg(a, b, c, d, x[ 1], s21, 0xf61e2562); /* 17 */
-    gg(d, a, b, c, x[ 6], s22, 0xc040b340); /* 18 */
-    gg(c, d, a, b, x[11], s23, 0x265e5a51); /* 19 */
-    gg(b, c, d, a, x[ 0], s24, 0xe9b6c7aa); /* 20 */
-    gg(a, b, c, d, x[ 5], s21, 0xd62f105d); /* 21 */
-    gg(d, a, b, c, x[10], s22,  0x2441453); /* 22 */
-    gg(c, d, a, b, x[15], s23, 0xd8a1e681); /* 23 */
-    gg(b, c, d, a, x[ 4], s24, 0xe7d3fbc8); /* 24 */
-    gg(a, b, c, d, x[ 9], s21, 0x21e1cde6); /* 25 */
-    gg(d, a, b, c, x[14], s22, 0xc33707d6); /* 26 */
-    gg(c, d, a, b, x[ 3], s23, 0xf4d50d87); /* 27 */
-    gg(b, c, d, a, x[ 8], s24, 0x455a14ed); /* 28 */
-    gg(a, b, c, d, x[13], s21, 0xa9e3e905); /* 29 */
-    gg(d, a, b, c, x[ 2], s22, 0xfcefa3f8); /* 30 */
-    gg(c, d, a, b, x[ 7], s23, 0x676f02d9); /* 31 */
-    gg(b, c, d, a, x[12], s24, 0x8d2a4c8a); /* 32 */
+    /* Round 2 */
+    GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+    GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+    GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+    GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+    GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+    GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+    GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+    GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+    GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+    GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+    GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+    GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+    GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+    GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+    GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+    GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
 
-    /* round 3 */
-    hh(a, b, c, d, x[ 5], s31, 0xfffa3942); /* 33 */
-    hh(d, a, b, c, x[ 8], s32, 0x8771f681); /* 34 */
-    hh(c, d, a, b, x[11], s33, 0x6d9d6122); /* 35 */
-    hh(b, c, d, a, x[14], s34, 0xfde5380c); /* 36 */
-    hh(a, b, c, d, x[ 1], s31, 0xa4beea44); /* 37 */
-    hh(d, a, b, c, x[ 4], s32, 0x4bdecfa9); /* 38 */
-    hh(c, d, a, b, x[ 7], s33, 0xf6bb4b60); /* 39 */
-    hh(b, c, d, a, x[10], s34, 0xbebfbc70); /* 40 */
-    hh(a, b, c, d, x[13], s31, 0x289b7ec6); /* 41 */
-    hh(d, a, b, c, x[ 0], s32, 0xeaa127fa); /* 42 */
-    hh(c, d, a, b, x[ 3], s33, 0xd4ef3085); /* 43 */
-    hh(b, c, d, a, x[ 6], s34,  0x4881d05); /* 44 */
-    hh(a, b, c, d, x[ 9], s31, 0xd9d4d039); /* 45 */
-    hh(d, a, b, c, x[12], s32, 0xe6db99e5); /* 46 */
-    hh(c, d, a, b, x[15], s33, 0x1fa27cf8); /* 47 */
-    hh(b, c, d, a, x[ 2], s34, 0xc4ac5665); /* 48 */
+    /* Round 3 */
+    HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+    HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+    HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+    HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+    HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+    HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+    HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+    HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+    HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+    HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+    HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+    HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+    HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+    HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+    HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+    HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
 
-    /* round 4 */
-    ii(a, b, c, d, x[ 0], s41, 0xf4292244); /* 49 */
-    ii(d, a, b, c, x[ 7], s42, 0x432aff97); /* 50 */
-    ii(c, d, a, b, x[14], s43, 0xab9423a7); /* 51 */
-    ii(b, c, d, a, x[ 5], s44, 0xfc93a039); /* 52 */
-    ii(a, b, c, d, x[12], s41, 0x655b59c3); /* 53 */
-    ii(d, a, b, c, x[ 3], s42, 0x8f0ccc92); /* 54 */
-    ii(c, d, a, b, x[10], s43, 0xffeff47d); /* 55 */
-    ii(b, c, d, a, x[ 1], s44, 0x85845dd1); /* 56 */
-    ii(a, b, c, d, x[ 8], s41, 0x6fa87e4f); /* 57 */
-    ii(d, a, b, c, x[15], s42, 0xfe2ce6e0); /* 58 */
-    ii(c, d, a, b, x[ 6], s43, 0xa3014314); /* 59 */
-    ii(b, c, d, a, x[13], s44, 0x4e0811a1); /* 60 */
-    ii(a, b, c, d, x[ 4], s41, 0xf7537e82); /* 61 */
-    ii(d, a, b, c, x[11], s42, 0xbd3af235); /* 62 */
-    ii(c, d, a, b, x[ 2], s43, 0x2ad7d2bb); /* 63 */
-    ii(b, c, d, a, x[ 9], s44, 0xeb86d391); /* 64 */
+    /* Round 4 */
+    II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+    II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+    II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+    II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+    II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+    II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+    II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+    II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+    II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+    II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+    II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+    II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+    II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+    II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+    II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+    II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
 
     state[0] += a;
     state[1] += b;