Skip to content

Commit 22eb989

Browse files
danielgustafssonbagder
danielgustafsson
authored and
bagder
committed
crypto: ensure crypto initialization works
Make sure that context initialization during hash setup works to avoid going forward with the risk of a null pointer dereference. Reported-by: Philippe Antoine on HackerOne Assisted-by: Jay Satiro Assisted-by: Daniel Stenberg Closes #11614
1 parent bec0c5b commit 22eb989

File tree

7 files changed

+58
-24
lines changed

7 files changed

+58
-24
lines changed

‎lib/curl_md4.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
***************************************************************************/
2626

2727
#include "curl_setup.h"
28+
#include <curl/curl.h>
2829

2930
#if !defined(CURL_DISABLE_CRYPTO_AUTH)
3031

3132
#define MD4_DIGEST_LENGTH 16
3233

33-
void Curl_md4it(unsigned char *output, const unsigned char *input,
34-
const size_t len);
34+
CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
35+
const size_t len);
3536

3637
#endif /* !defined(CURL_DISABLE_CRYPTO_AUTH) */
3738

‎lib/curl_ntlm_core.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
419419
{
420420
size_t len = strlen(password);
421421
unsigned char *pw;
422+
CURLcode result;
422423
if(len > SIZE_T_MAX/2) /* avoid integer overflow */
423424
return CURLE_OUT_OF_MEMORY;
424425
pw = len ? malloc(len * 2) : (unsigned char *)strdup("");
@@ -428,12 +429,13 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
428429
ascii_to_unicode_le(pw, password, len);
429430

430431
/* Create NT hashed password. */
431-
Curl_md4it(ntbuffer, pw, 2 * len);
432-
memset(ntbuffer + 16, 0, 21 - 16);
432+
result = Curl_md4it(ntbuffer, pw, 2 * len);
433+
if(!result)
434+
memset(ntbuffer + 16, 0, 21 - 16);
433435

434436
free(pw);
435437

436-
return CURLE_OK;
438+
return result;
437439
}
438440

439441
#if !defined(USE_WINDOWS_SSPI)

‎lib/md4.c

+30-12
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#ifdef USE_WOLFSSL
4444
#include <wolfssl/options.h>
45+
#define VOID_MD4_INIT
4546
#ifdef NO_MD4
4647
#define WOLFSSL_NO_MD4
4748
#endif
@@ -92,9 +93,10 @@
9293

9394
typedef struct md4_ctx MD4_CTX;
9495

95-
static void MD4_Init(MD4_CTX *ctx)
96+
static int MD4_Init(MD4_CTX *ctx)
9697
{
9798
md4_init(ctx);
99+
return 1;
98100
}
99101

100102
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
@@ -114,9 +116,9 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
114116
#elif defined(AN_APPLE_OS)
115117
typedef CC_MD4_CTX MD4_CTX;
116118

117-
static void MD4_Init(MD4_CTX *ctx)
119+
static int MD4_Init(MD4_CTX *ctx)
118120
{
119-
(void)CC_MD4_Init(ctx);
121+
return CC_MD4_Init(ctx);
120122
}
121123

122124
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
@@ -137,15 +139,22 @@ struct md4_ctx {
137139
};
138140
typedef struct md4_ctx MD4_CTX;
139141

140-
static void MD4_Init(MD4_CTX *ctx)
142+
static int MD4_Init(MD4_CTX *ctx)
141143
{
142144
ctx->hCryptProv = 0;
143145
ctx->hHash = 0;
144146

145-
if(CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_FULL,
146-
CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
147-
CryptCreateHash(ctx->hCryptProv, CALG_MD4, 0, 0, &ctx->hHash);
147+
if(!CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_FULL,
148+
CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
149+
return 0;
150+
151+
if(!CryptCreateHash(ctx->hCryptProv, CALG_MD4, 0, 0, &ctx->hHash)) {
152+
CryptReleaseContext(ctx->hCryptProv, 0);
153+
ctx->hCryptProv = 0;
154+
return 0;
148155
}
156+
157+
return 1;
149158
}
150159

151160
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
@@ -176,10 +185,11 @@ struct md4_ctx {
176185
};
177186
typedef struct md4_ctx MD4_CTX;
178187

179-
static void MD4_Init(MD4_CTX *ctx)
188+
static int MD4_Init(MD4_CTX *ctx)
180189
{
181190
ctx->data = NULL;
182191
ctx->size = 0;
192+
return 1;
183193
}
184194

185195
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
@@ -258,7 +268,7 @@ struct md4_ctx {
258268
};
259269
typedef struct md4_ctx MD4_CTX;
260270

261-
static void MD4_Init(MD4_CTX *ctx);
271+
static int MD4_Init(MD4_CTX *ctx);
262272
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size);
263273
static void MD4_Final(unsigned char *result, MD4_CTX *ctx);
264274

@@ -397,7 +407,7 @@ static const void *body(MD4_CTX *ctx, const void *data, unsigned long size)
397407
return ptr;
398408
}
399409

400-
static void MD4_Init(MD4_CTX *ctx)
410+
static int MD4_Init(MD4_CTX *ctx)
401411
{
402412
ctx->a = 0x67452301;
403413
ctx->b = 0xefcdab89;
@@ -406,6 +416,7 @@ static void MD4_Init(MD4_CTX *ctx)
406416

407417
ctx->lo = 0;
408418
ctx->hi = 0;
419+
return 1;
409420
}
410421

411422
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
@@ -496,14 +507,21 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
496507

497508
#endif /* CRYPTO LIBS */
498509

499-
void Curl_md4it(unsigned char *output, const unsigned char *input,
500-
const size_t len)
510+
CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
511+
const size_t len)
501512
{
502513
MD4_CTX ctx;
503514

515+
#ifdef VOID_MD4_INIT
504516
MD4_Init(&ctx);
517+
#else
518+
if(!MD4_Init(&ctx))
519+
return CURLE_FAILED_INIT;
520+
#endif
521+
505522
MD4_Update(&ctx, input, curlx_uztoui(len));
506523
MD4_Final(output, &ctx);
524+
return CURLE_OK;
507525
}
508526

509527
#endif /* USE_CURL_NTLM_CORE */

‎lib/md5.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ static CURLcode my_md5_init(my_md5_ctx *ctx)
213213

214214
if(!CryptCreateHash(ctx->hCryptProv, CALG_MD5, 0, 0, &ctx->hHash)) {
215215
CryptReleaseContext(ctx->hCryptProv, 0);
216-
return CURLE_OUT_OF_MEMORY;
216+
ctx->hCryptProv = 0;
217+
return CURLE_FAILED_INIT;
217218
}
218219

219220
return CURLE_OK;

‎lib/sha256.c

+12-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ static CURLcode my_sha256_init(my_sha256_ctx *ctx)
110110
if(!ctx->openssl_ctx)
111111
return CURLE_OUT_OF_MEMORY;
112112

113-
EVP_DigestInit_ex(ctx->openssl_ctx, EVP_sha256(), NULL);
113+
if(!EVP_DigestInit_ex(ctx->openssl_ctx, EVP_sha256(), NULL)) {
114+
EVP_MD_CTX_destroy(ctx->openssl_ctx);
115+
return CURLE_FAILED_INIT;
116+
}
114117
return CURLE_OK;
115118
}
116119

@@ -218,9 +221,14 @@ typedef struct sha256_ctx my_sha256_ctx;
218221

219222
static CURLcode my_sha256_init(my_sha256_ctx *ctx)
220223
{
221-
if(CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_AES,
222-
CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
223-
CryptCreateHash(ctx->hCryptProv, CALG_SHA_256, 0, 0, &ctx->hHash);
224+
if(!CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_AES,
225+
CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
226+
return CURLE_OUT_OF_MEMORY;
227+
228+
if(!CryptCreateHash(ctx->hCryptProv, CALG_SHA_256, 0, 0, &ctx->hHash)) {
229+
CryptReleaseContext(ctx->hCryptProv, 0);
230+
ctx->hCryptProv = 0;
231+
return CURLE_FAILED_INIT;
224232
}
225233

226234
return CURLE_OK;

‎lib/vtls/openssl.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -4730,7 +4730,10 @@ static CURLcode ossl_sha256sum(const unsigned char *tmp, /* input */
47304730
mdctx = EVP_MD_CTX_create();
47314731
if(!mdctx)
47324732
return CURLE_OUT_OF_MEMORY;
4733-
EVP_DigestInit(mdctx, EVP_sha256());
4733+
if(!EVP_DigestInit(mdctx, EVP_sha256())) {
4734+
EVP_MD_CTX_destroy(mdctx);
4735+
return CURLE_FAILED_INIT;
4736+
}
47344737
EVP_DigestUpdate(mdctx, tmp, tmplen);
47354738
EVP_DigestFinal_ex(mdctx, sha256sum, &len);
47364739
EVP_MD_CTX_destroy(mdctx);

‎lib/vtls/wolfssl.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,8 @@ static CURLcode wolfssl_sha256sum(const unsigned char *tmp, /* input */
13521352
{
13531353
wc_Sha256 SHA256pw;
13541354
(void)unused;
1355-
wc_InitSha256(&SHA256pw);
1355+
if(wc_InitSha256(&SHA256pw))
1356+
return CURLE_FAILED_INIT;
13561357
wc_Sha256Update(&SHA256pw, tmp, (word32)tmplen);
13571358
wc_Sha256Final(&SHA256pw, sha256sum);
13581359
return CURLE_OK;

0 commit comments

Comments
 (0)