mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
6cc066a2c5
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.
64 lines
2.4 KiB
C
64 lines
2.4 KiB
C
#ifndef HEADER_CURL_MD5_H
|
|
#define HEADER_CURL_MD5_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, 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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#ifndef CURL_DISABLE_CRYPTO_AUTH
|
|
#include "curl_hmac.h"
|
|
|
|
#define MD5_DIGEST_LEN 16
|
|
|
|
typedef void (* Curl_MD5_init_func)(void *context);
|
|
typedef void (* Curl_MD5_update_func)(void *context,
|
|
const unsigned char *data,
|
|
unsigned int len);
|
|
typedef void (* Curl_MD5_final_func)(unsigned char *result, void *context);
|
|
|
|
typedef struct {
|
|
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;
|
|
|
|
typedef struct {
|
|
const MD5_params *md5_hash; /* Hash function definition */
|
|
void *md5_hashctx; /* Hash function context */
|
|
} MD5_context;
|
|
|
|
extern const MD5_params Curl_DIGEST_MD5[1];
|
|
extern const HMAC_params Curl_HMAC_MD5[1];
|
|
|
|
void Curl_md5it(unsigned char *output,
|
|
const unsigned char *input);
|
|
|
|
MD5_context * Curl_MD5_init(const MD5_params *md5params);
|
|
int Curl_MD5_update(MD5_context *context,
|
|
const unsigned char *data,
|
|
unsigned int len);
|
|
int Curl_MD5_final(MD5_context *context, unsigned char *result);
|
|
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_MD5_H */
|