From bbe2386bff61acf0105806959b7f56a4a12db86e Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 17 Aug 2008 00:01:26 +0000 Subject: libcurl internal md5.h header file renamed to curl_md5.h --- lib/Makefile.Watcom | 4 ++-- lib/Makefile.inc | 4 ++-- lib/curl_md5.h | 29 +++++++++++++++++++++++++++++ lib/http_digest.c | 2 +- lib/md5.c | 2 +- lib/md5.h | 29 ----------------------------- 6 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 lib/curl_md5.h delete mode 100644 lib/md5.h (limited to 'lib') diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 4a0b093be..5088875ae 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -343,10 +343,10 @@ $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h splay.h sendf.h strequal.h & - base64.h md5.h http_digest.h strtok.h url.h memory.h easyif.h & + base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h & - ..\include\curl\curlrules.h setup_once.h md5.h + ..\include\curl\curlrules.h setup_once.h curl_md5.h $(OBJ_DIR)\http_negotiate.obj: http_negotiate.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h $(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h & diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 875e56754..414e1d342 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -15,8 +15,8 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h \ - strtok.h connect.h llist.h hash.h content_encoding.h share.h md5.h \ - http_digest.h http_negotiate.h http_ntlm.h inet_pton.h \ + strtok.h connect.h llist.h hash.h content_encoding.h share.h \ + curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h \ strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ diff --git a/lib/curl_md5.h b/lib/curl_md5.h new file mode 100644 index 000000000..19c34fb4d --- /dev/null +++ b/lib/curl_md5.h @@ -0,0 +1,29 @@ +#ifndef __CURL_MD5_H +#define __CURL_MD5_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + ***************************************************************************/ + +void Curl_md5it(unsigned char *output, + const unsigned char *input); + +#endif diff --git a/lib/http_digest.c b/lib/http_digest.c index 14612c527..0132a84e3 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -34,7 +34,7 @@ #include "sendf.h" #include "strequal.h" #include "base64.h" -#include "md5.h" +#include "curl_md5.h" #include "http_digest.h" #include "strtok.h" #include "url.h" /* for Curl_safefree() */ diff --git a/lib/md5.c b/lib/md5.c index 92d4bff09..3d54f650d 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -338,7 +338,7 @@ static void Decode (UINT4 *output, #include #endif -#include "md5.h" +#include "curl_md5.h" void Curl_md5it(unsigned char *outbuffer, /* 16 bytes */ const unsigned char *input) diff --git a/lib/md5.h b/lib/md5.h deleted file mode 100644 index 63cc70e84..000000000 --- a/lib/md5.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __MD5_H -#define __MD5_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - * $Id$ - ***************************************************************************/ - -void Curl_md5it(unsigned char *output, - const unsigned char *input); - -#endif -- cgit v1.2.3