diff --git a/lib/curl_md5.h b/lib/curl_md5.h index b445500fc27350ff0022f7e132941835bebc76ca..9c0e0b5eee657491fe8f1bfda67e6fbd166b3d1c 100644 --- a/lib/curl_md5.h +++ b/lib/curl_md5.h @@ -34,9 +34,9 @@ typedef void (* Curl_MD5_update_func)(void *context, typedef void (* Curl_MD5_final_func)(unsigned char *result, void *context); typedef struct { - Curl_MD5_init_func md5_init; /* Initialize context procedure */ - Curl_MD5_update_func md5_update; /* Update context with data */ - Curl_MD5_final_func md5_final; /* Get final result procedure */ + Curl_MD5_init_func md5_init_func; /* Initialize context procedure */ + Curl_MD5_update_func md5_update_func; /* Update context with data */ + Curl_MD5_final_func md5_final_func; /* Get final result procedure */ unsigned int md5_ctxtsize; /* Context structure size */ unsigned int md5_resultlen; /* Result length (bytes) */ } MD5_params; diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 39952d2f19a2796b6b84ad4659e6d8baa96657fc..6d1fb80919f946b8040e16741ff8f7bc8a38c318 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -145,7 +145,7 @@ static void setup_des_key(const unsigned char *key_56, { char key[8]; extend_key_56_to_64(key_56, key); - des_set_key(des, key); + des_set_key(des, (const uint8_t*)key); } #elif defined(USE_GNUTLS) @@ -389,7 +389,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct SessionHandle *data, #elif defined(USE_GNUTLS_NETTLE) struct md4_ctx MD4pw; md4_init(&MD4pw); - md4_update(&MD4pw, 2 * len, pw); + md4_update(&MD4pw, (unsigned int)(2 * len), pw); md4_digest(&MD4pw, MD4_DIGEST_SIZE, ntbuffer); #elif defined(USE_GNUTLS) gcry_md_hd_t MD4pw; diff --git a/lib/md5.c b/lib/md5.c index 8d66d95ec73fb2fba47a876486ab2af7677e9ba2..c32455e9e61bf707100921eed6a51d80ce5c238d 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -445,7 +445,7 @@ MD5_context *Curl_MD5_init(const MD5_params *md5params) ctxt->md5_hash = md5params; - md5params->md5_init(ctxt->md5_hashctx); + (*md5params->md5_init_func)(ctxt->md5_hashctx); return ctxt; } @@ -454,14 +454,14 @@ int Curl_MD5_update(MD5_context *context, const unsigned char *data, unsigned int len) { - (*context->md5_hash->md5_update)(context->md5_hashctx, data, len); + (*context->md5_hash->md5_update_func)(context->md5_hashctx, data, len); return 0; } int Curl_MD5_final(MD5_context *context, unsigned char *result) { - (*context->md5_hash->md5_final)(result, context->md5_hashctx); + (*context->md5_hash->md5_final_func)(result, context->md5_hashctx); free(context->md5_hashctx); free(context);