Implemented the range handling code for XOVER

[citadel.git] / citadel / md5.c

diff --git a/citadel/md5.c b/citadel/md5.c
index c0ba96afad0341f1e0c24828565888616f076b53..9d0b4421e7e90fb83092942a268de4d6474285a5 100644 (file)
--- a/citadel/md5.c
+++ b/citadel/md5.c
@@ -150,7 +150,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (cit_uint32_t *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));       /* In case it's sensitive */
+    memset(ctx, 0, sizeof(struct MD5Context)); /* In case it's sensitive */
 }
 
 #ifndef ASM_MD5
@@ -336,25 +336,22 @@ void MD5Transform(cit_uint32_t buf[4], cit_uint32_t const in[16])
  * md5 string
  */
 
-char *make_apop_string(char *realpass, char *nonce, char *buffer)
+char *make_apop_string(char *realpass, char *nonce, char *buffer, size_t n)
 {
    struct MD5Context ctx;
    u_char rawdigest[MD5_DIGEST_LEN];
    int i;
    
    MD5Init(&ctx);
-//   printf("MD5@@: Adding nonce: %s\n", nonce);
    MD5Update(&ctx, (u_char*)nonce, strlen(nonce));
-//   printf("MD5@@: Adding password %s\n", realpass);
    MD5Update(&ctx, (u_char*)realpass, strlen(realpass));
    MD5Final(rawdigest, &ctx);
    for (i=0; i<MD5_DIGEST_LEN; i++)
    {
-      sprintf(&buffer[i*2], "%02X", (unsigned char) (rawdigest[i] & 0xff));
+      snprintf(&buffer[i*2], n - i*2, "%02X", (unsigned char) (rawdigest[i] & 0xff));
       buffer[i*2] = tolower(buffer[i*2]);
       buffer[(i*2)+1] = tolower(buffer[(i*2)+1]);
    }
-//   printf("MD5@@: Result is %s\n", buffer);
    return buffer;
 }