Skip to content

Commit 2e11b93

Browse files
krytarowskikrytarowski
committed
Add interceptors for md5(3) from NetBSD
Summary: MD5Init, MD5Update, MD5Final, MD5End, MD5File, MD5Data - calculates the RSA Data Security, Inc., "MD5" message digest. Add a dedicated test. Reviewers: vitalybuka, joerg Reviewed By: vitalybuka Subscribers: kubamracek, llvm-commits, mgorny, #sanitizers Tags: #sanitizers Differential Revision: https://reviews.llvm.org/D54993 llvm-svn: 348679
1 parent f9b8569 commit 2e11b93

File tree

5 files changed

+199
-0
lines changed

5 files changed

+199
-0
lines changed

‎compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8151,6 +8151,83 @@ INTERCEPTOR(char *, RMD160Data, u8 *data, SIZE_T len, char *buf) {
81518151
#define INIT_RMD160
81528152
#endif
81538153

8154+
#if SANITIZER_INTERCEPT_MD5
8155+
INTERCEPTOR(void, MD5Init, void *context) {
8156+
void *ctx;
8157+
COMMON_INTERCEPTOR_ENTER(ctx, MD5Init, context);
8158+
REAL(MD5Init)(context);
8159+
if (context)
8160+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz);
8161+
}
8162+
8163+
INTERCEPTOR(void, MD5Update, void *context, const unsigned char *data,
8164+
unsigned int len) {
8165+
void *ctx;
8166+
COMMON_INTERCEPTOR_ENTER(ctx, MD5Update, context, data, len);
8167+
if (data && len > 0)
8168+
COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
8169+
if (context)
8170+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz);
8171+
REAL(MD5Update)(context, data, len);
8172+
if (context)
8173+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz);
8174+
}
8175+
8176+
INTERCEPTOR(void, MD5Final, unsigned char digest[16], void *context) {
8177+
void *ctx;
8178+
COMMON_INTERCEPTOR_ENTER(ctx, MD5Final, digest, context);
8179+
if (context)
8180+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz);
8181+
REAL(MD5Final)(digest, context);
8182+
if (digest)
8183+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16);
8184+
}
8185+
8186+
INTERCEPTOR(char *, MD5End, void *context, char *buf) {
8187+
void *ctx;
8188+
COMMON_INTERCEPTOR_ENTER(ctx, MD5End, context, buf);
8189+
if (context)
8190+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz);
8191+
char *ret = REAL(MD5End)(context, buf);
8192+
if (ret)
8193+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
8194+
return ret;
8195+
}
8196+
8197+
INTERCEPTOR(char *, MD5File, const char *filename, char *buf) {
8198+
void *ctx;
8199+
COMMON_INTERCEPTOR_ENTER(ctx, MD5File, filename, buf);
8200+
if (filename)
8201+
COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
8202+
char *ret = REAL(MD5File)(filename, buf);
8203+
if (ret)
8204+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
8205+
return ret;
8206+
}
8207+
8208+
INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len,
8209+
char *buf) {
8210+
void *ctx;
8211+
COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf);
8212+
if (data && len > 0)
8213+
COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
8214+
char *ret = REAL(MD5Data)(data, len, buf);
8215+
if (ret)
8216+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
8217+
return ret;
8218+
}
8219+
8220+
#define INIT_MD5 \
8221+
COMMON_INTERCEPT_FUNCTION(MD5Init); \
8222+
COMMON_INTERCEPT_FUNCTION(MD5Update); \
8223+
COMMON_INTERCEPT_FUNCTION(MD5Final); \
8224+
COMMON_INTERCEPT_FUNCTION(MD5End); \
8225+
COMMON_INTERCEPT_FUNCTION(MD5File); \
8226+
COMMON_INTERCEPT_FUNCTION(MD5Data)
8227+
#else
8228+
#define INIT_MD5
8229+
#endif
8230+
81548231
static void InitializeCommonInterceptors() {
81558232
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
81568233
interceptor_metadata_map =
@@ -8424,6 +8501,7 @@ static void InitializeCommonInterceptors() {
84248501
INIT_SHA1;
84258502
INIT_MD4;
84268503
INIT_RMD160;
8504+
INIT_MD5;
84278505

84288506
INIT___PRINTF_CHK;
84298507
}

‎compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,5 +538,6 @@
538538
#define SANITIZER_INTERCEPT_SHA1 SI_NETBSD
539539
#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
540540
#define SANITIZER_INTERCEPT_RMD160 SI_NETBSD
541+
#define SANITIZER_INTERCEPT_MD5 SI_NETBSD
541542

542543
#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H

‎compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,6 +2110,9 @@ const unsigned MD4_return_length = MD4_DIGEST_STRING_LENGTH;
21102110

21112111
const unsigned RMD160_CTX_sz = sizeof(RMD160_CTX);
21122112
const unsigned RMD160_return_length = RMD160_DIGEST_STRING_LENGTH;
2113+
2114+
const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
2115+
const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH;
21132116
} // namespace __sanitizer
21142117

21152118
using namespace __sanitizer;

‎compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2234,6 +2234,9 @@ extern const unsigned MD4_return_length;
22342234

22352235
extern const unsigned RMD160_CTX_sz;
22362236
extern const unsigned RMD160_return_length;
2237+
2238+
extern const unsigned MD5_CTX_sz;
2239+
extern const unsigned MD5_return_length;
22372240
} // namespace __sanitizer
22382241

22392242
#define CHECK_TYPE_SIZE(TYPE) \

‎compiler-rt/test/sanitizer_common/TestCases/NetBSD/md5.cc

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
2+
3+
#include <sys/param.h>
4+
5+
#include <assert.h>
6+
#include <endian.h>
7+
#include <md5.h>
8+
#include <stdio.h>
9+
#include <stdlib.h>
10+
#include <string.h>
11+
12+
void test1() {
13+
MD5_CTX ctx;
14+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
15+
uint8_t digest[MD5_DIGEST_LENGTH];
16+
17+
MD5Init(&ctx);
18+
MD5Update(&ctx, entropy, __arraycount(entropy));
19+
MD5Final(digest, &ctx);
20+
21+
printf("test1: '");
22+
for (size_t i = 0; i < __arraycount(digest); i++)
23+
printf("%02x", digest[i]);
24+
printf("'\n");
25+
}
26+
27+
void test2() {
28+
MD5_CTX ctx;
29+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
30+
char digest[MD5_DIGEST_STRING_LENGTH];
31+
32+
MD5Init(&ctx);
33+
MD5Update(&ctx, entropy, __arraycount(entropy));
34+
char *p = MD5End(&ctx, digest);
35+
assert(p);
36+
37+
printf("test2: '%s'\n", digest);
38+
}
39+
40+
void test3() {
41+
MD5_CTX ctx;
42+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
43+
44+
MD5Init(&ctx);
45+
MD5Update(&ctx, entropy, __arraycount(entropy));
46+
char *p = MD5End(&ctx, NULL);
47+
assert(strlen(p) == MD5_DIGEST_STRING_LENGTH - 1);
48+
49+
printf("test3: '%s'\n", p);
50+
51+
free(p);
52+
}
53+
54+
void test4() {
55+
char digest[MD5_DIGEST_STRING_LENGTH];
56+
57+
char *p = MD5File("/etc/fstab", digest);
58+
assert(p == digest);
59+
60+
printf("test4: '%s'\n", p);
61+
}
62+
63+
void test5() {
64+
char *p = MD5File("/etc/fstab", NULL);
65+
assert(strlen(p) == MD5_DIGEST_STRING_LENGTH - 1);
66+
67+
printf("test5: '%s'\n", p);
68+
69+
free(p);
70+
}
71+
72+
void test6() {
73+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
74+
char digest[MD5_DIGEST_STRING_LENGTH];
75+
76+
char *p = MD5Data(entropy, __arraycount(entropy), digest);
77+
assert(p == digest);
78+
79+
printf("test6: '%s'\n", p);
80+
}
81+
82+
void test7() {
83+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
84+
85+
char *p = MD5Data(entropy, __arraycount(entropy), NULL);
86+
assert(strlen(p) == MD5_DIGEST_STRING_LENGTH - 1);
87+
88+
printf("test7: '%s'\n", p);
89+
90+
free(p);
91+
}
92+
93+
int main(void) {
94+
printf("MD5\n");
95+
96+
test1();
97+
test2();
98+
test3();
99+
test4();
100+
test5();
101+
test6();
102+
test7();
103+
104+
// CHECK: MD5
105+
// CHECK: test1: '86e65b1ef4a830af347ac05ab4f0e999'
106+
// CHECK: test2: '86e65b1ef4a830af347ac05ab4f0e999'
107+
// CHECK: test3: '86e65b1ef4a830af347ac05ab4f0e999'
108+
// CHECK: test4: 'd6798ca88175b5feece4dda691a5b9b5'
109+
// CHECK: test5: 'd6798ca88175b5feece4dda691a5b9b5'
110+
// CHECK: test6: '86e65b1ef4a830af347ac05ab4f0e999'
111+
// CHECK: test7: '86e65b1ef4a830af347ac05ab4f0e999'
112+
113+
return 0;
114+
}

0 commit comments

Comments
 (0)