summaryrefslogtreecommitdiff
path: root/lib/md5.c
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2012-05-22 22:49:40 +0900
committerDaniel Stenberg <daniel@haxx.se>2012-05-22 16:40:09 +0200
commit6cc066a2c57e39306e7be538826fd4e17a8fa102 (patch)
tree6a0d115b129d70dad7d959635ffb1abe81917ed2 /lib/md5.c
parent0fd7fa7daf39e902e9f09d1133e01658e75312cc (diff)
downloadcurl-6cc066a2c57e39306e7be538826fd4e17a8fa102.tar.gz
Fixed compile error with GNUTLS+NETTLE
In nettle/md5.h, md5_init and md5_update are defined as macros to nettle_md5_init and nettle_md5_update respectively. This causes error when using MD5_params.md5_init and md5_update. This patch renames these members as md5_init_func and md5_update_func to avoid name conflict. For completeness, MD5_params.md5_final was also renamed as md5_final_func. The changes in curl_ntlm_core.c is conversion error and fixed by casting to proper type.
Diffstat (limited to 'lib/md5.c')
-rw-r--r--lib/md5.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/md5.c b/lib/md5.c
index 8d66d95ec..c32455e9e 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);