moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 08:38:49 -05:00
Code Issues Releases Wiki Activity

md4: Move the mbed TLS MD4 implementation out of the NTLM code

Browse Source
This commit is contained in:
Steve Holme 2019-04-14 03:27:21 +01:00
parent c5eb2fd618
commit 2ff216f1b0
No known key found for this signature in database
GPG Key ID: 4059CB85CA7E8F19
3 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/curl_md4.h
View File

@ -27,17 +27,15 @@
#if defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || \ #if defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || \
defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \ defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \
defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \ defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \
defined(USE_OS400CRYPTO) || \ defined(USE_OS400CRYPTO) || defined(USE_MBEDTLS)
(defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C))
#define MD4_DIGEST_LENGTH 16 #define MD4_DIGEST_LENGTH 16
void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len); void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len);
#endif /* defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || #endif /* defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) ||
defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \ defined(USE_OPENSSL) || defined(USE_SECTRANSP) ||
defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \ defined(USE_WIN32_CRYPTO) || defined(USE_NSS) ||
defined(USE_OS400CRYPTO) || \ defined(USE_OS400CRYPTO) || defined(USE_MBEDTLS) */
(defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) */
#endif /* HEADER_CURL_MD4_H */ #endif /* HEADER_CURL_MD4_H */

9
lib/curl_ntlm_core.c
View File

@ -94,10 +94,7 @@
#elif defined(USE_MBEDTLS) #elif defined(USE_MBEDTLS)
# include <mbedtls/des.h> # include <mbedtls/des.h>
# include <mbedtls/md4.h> # include "curl_md4.h"
# if !defined(MBEDTLS_MD4_C)
# include "curl_md4.h"
# endif
#elif defined(USE_SECTRANSP) #elif defined(USE_SECTRANSP)
@ -575,11 +572,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct Curl_easy *data,
#elif defined(USE_NSS) #elif defined(USE_NSS)
Curl_md4it(ntbuffer, pw, 2 * len); Curl_md4it(ntbuffer, pw, 2 * len);
#elif defined(USE_MBEDTLS) #elif defined(USE_MBEDTLS)
#if defined(MBEDTLS_MD4_C)
mbedtls_md4(pw, 2 * len, ntbuffer);
#else
Curl_md4it(ntbuffer, pw, 2 * len); Curl_md4it(ntbuffer, pw, 2 * len);
#endif
#elif defined(USE_SECTRANSP) #elif defined(USE_SECTRANSP)
Curl_md4it(ntbuffer, pw, 2 * len); Curl_md4it(ntbuffer, pw, 2 * len);
#elif defined(USE_OS400CRYPTO) #elif defined(USE_OS400CRYPTO)

53
lib/md4.c
View File

@ -180,6 +180,48 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
CryptReleaseContext(ctx->hCryptProv, 0); CryptReleaseContext(ctx->hCryptProv, 0);
} }
#elif(defined(USE_MBEDTLS) && defined(MBEDTLS_MD4_C))
#include <mbedtls/md4.h>
#include "curl_md4.h"
#include "warnless.h"
#include "curl_memory.h"
/* The last #include file should be: */
#include "memdebug.h"
typedef struct {
void *data;
unsigned long size;
} MD4_CTX;
static void MD4_Init(MD4_CTX *ctx)
{
ctx->data = NULL;
ctx->size = 0;
}
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
{
if(ctx->data == NULL) {
ctx->data = malloc(size);
if(ctx->data != NULL) {
memcpy(ctx->data, data, size);
ctx->size = size;
}
}
}
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
{
if(ctx->data != NULL) {
mbedtls_md4(ctx->data, ctx->size, result);
Curl_safefree(ctx->data);
ctx->size = 0;
}
}
#elif defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ #elif defined(USE_NSS) || defined(USE_OS400CRYPTO) || \
(defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \ (defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \
(defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C))
@ -479,9 +521,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
#if defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || \ #if defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || \
defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \ defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \
defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \ defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \
defined(USE_OS400CRYPTO) || \ defined(USE_OS400CRYPTO) || defined(USE_MBEDTLS)
(defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \
(defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C))
void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len) void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len)
{ {
@ -492,7 +532,6 @@ void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len)
} }
#endif /* defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || #endif /* defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) ||
defined(USE_OPENSSL) || defined(USE_SECTRANSP) || \ defined(USE_OPENSSL) || defined(USE_SECTRANSP) ||
defined(USE_WIN32_CRYPTO) || defined(USE_NSS) || \ defined(USE_WIN32_CRYPTO) || defined(USE_NSS) ||
defined(USE_OS400CRYPTO) || \ defined(USE_OS400CRYPTO) || defined(USE_MBEDTLS) */
(defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) */