Skip to content

Commit e9bf12f

Browse files
krytarowskikrytarowski
committed
Add interceptors for the md4(3) from NetBSD
Summary: MD4Init, MD4Update, MD4Final, MD4End, MD4File, MD4Data - calculates the RSA Data Security, Inc., "MD4" message digest. Add dedicated test. Reviewers: vitalybuka, joerg Reviewed By: vitalybuka Subscribers: kubamracek, llvm-commits, mgorny, #sanitizers Tags: #sanitizers Differential Revision: https://reviews.llvm.org/D54990 llvm-svn: 348677
1 parent 3f47a6f commit e9bf12f

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
@@ -7981,6 +7981,83 @@ INTERCEPTOR(char *, SHA1Data, u8 *data, SIZE_T len, char *buf) {
79817981
#define INIT_SHA1
79827982
#endif
79837983

7984+
#if SANITIZER_INTERCEPT_MD4
7985+
INTERCEPTOR(void, MD4Init, void *context) {
7986+
void *ctx;
7987+
COMMON_INTERCEPTOR_ENTER(ctx, MD4Init, context);
7988+
REAL(MD4Init)(context);
7989+
if (context)
7990+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD4_CTX_sz);
7991+
}
7992+
7993+
INTERCEPTOR(void, MD4Update, void *context, const unsigned char *data,
7994+
unsigned int len) {
7995+
void *ctx;
7996+
COMMON_INTERCEPTOR_ENTER(ctx, MD4Update, context, data, len);
7997+
if (data && len > 0)
7998+
COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
7999+
if (context)
8000+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD4_CTX_sz);
8001+
REAL(MD4Update)(context, data, len);
8002+
if (context)
8003+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD4_CTX_sz);
8004+
}
8005+
8006+
INTERCEPTOR(void, MD4Final, unsigned char digest[16], void *context) {
8007+
void *ctx;
8008+
COMMON_INTERCEPTOR_ENTER(ctx, MD4Final, digest, context);
8009+
if (context)
8010+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD4_CTX_sz);
8011+
REAL(MD4Final)(digest, context);
8012+
if (digest)
8013+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16);
8014+
}
8015+
8016+
INTERCEPTOR(char *, MD4End, void *context, char *buf) {
8017+
void *ctx;
8018+
COMMON_INTERCEPTOR_ENTER(ctx, MD4End, context, buf);
8019+
if (context)
8020+
COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD4_CTX_sz);
8021+
char *ret = REAL(MD4End)(context, buf);
8022+
if (ret)
8023+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
8024+
return ret;
8025+
}
8026+
8027+
INTERCEPTOR(char *, MD4File, const char *filename, char *buf) {
8028+
void *ctx;
8029+
COMMON_INTERCEPTOR_ENTER(ctx, MD4File, filename, buf);
8030+
if (filename)
8031+
COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
8032+
char *ret = REAL(MD4File)(filename, buf);
8033+
if (ret)
8034+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
8035+
return ret;
8036+
}
8037+
8038+
INTERCEPTOR(char *, MD4Data, const unsigned char *data, unsigned int len,
8039+
char *buf) {
8040+
void *ctx;
8041+
COMMON_INTERCEPTOR_ENTER(ctx, MD4Data, data, len, buf);
8042+
if (data && len > 0)
8043+
COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
8044+
char *ret = REAL(MD4Data)(data, len, buf);
8045+
if (ret)
8046+
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
8047+
return ret;
8048+
}
8049+
8050+
#define INIT_MD4 \
8051+
COMMON_INTERCEPT_FUNCTION(MD4Init); \
8052+
COMMON_INTERCEPT_FUNCTION(MD4Update); \
8053+
COMMON_INTERCEPT_FUNCTION(MD4Final); \
8054+
COMMON_INTERCEPT_FUNCTION(MD4End); \
8055+
COMMON_INTERCEPT_FUNCTION(MD4File); \
8056+
COMMON_INTERCEPT_FUNCTION(MD4Data)
8057+
#else
8058+
#define INIT_MD4
8059+
#endif
8060+
79848061
static void InitializeCommonInterceptors() {
79858062
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
79868063
interceptor_metadata_map =
@@ -8252,6 +8329,7 @@ static void InitializeCommonInterceptors() {
82528329
INIT_STRTOI;
82538330
INIT_CAPSICUM;
82548331
INIT_SHA1;
8332+
INIT_MD4;
82558333

82568334
INIT___PRINTF_CHK;
82578335
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,5 +536,6 @@
536536
#define SANITIZER_INTERCEPT_STRTOI SI_NETBSD
537537
#define SANITIZER_INTERCEPT_CAPSICUM SI_FREEBSD
538538
#define SANITIZER_INTERCEPT_SHA1 SI_NETBSD
539+
#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
539540

540541
#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
@@ -2104,6 +2104,9 @@ const int modctl_exists = MODCTL_EXISTS;
21042104

21052105
const unsigned SHA1_CTX_sz = sizeof(SHA1_CTX);
21062106
const unsigned SHA1_return_length = SHA1_DIGEST_STRING_LENGTH;
2107+
2108+
const unsigned MD4_CTX_sz = sizeof(MD4_CTX);
2109+
const unsigned MD4_return_length = MD4_DIGEST_STRING_LENGTH;
21072110
} // namespace __sanitizer
21082111

21092112
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
@@ -2228,6 +2228,9 @@ extern const int si_SEGV_ACCERR;
22282228

22292229
extern const unsigned SHA1_CTX_sz;
22302230
extern const unsigned SHA1_return_length;
2231+
2232+
extern const unsigned MD4_CTX_sz;
2233+
extern const unsigned MD4_return_length;
22312234
} // namespace __sanitizer
22322235

22332236
#define CHECK_TYPE_SIZE(TYPE) \

‎compiler-rt/test/sanitizer_common/TestCases/NetBSD/md4.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 <md4.h>
8+
#include <stdio.h>
9+
#include <stdlib.h>
10+
#include <string.h>
11+
12+
void test1() {
13+
MD4_CTX ctx;
14+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
15+
uint8_t digest[MD4_DIGEST_LENGTH];
16+
17+
MD4Init(&ctx);
18+
MD4Update(&ctx, entropy, __arraycount(entropy));
19+
MD4Final(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+
MD4_CTX ctx;
29+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
30+
char digest[MD4_DIGEST_STRING_LENGTH];
31+
32+
MD4Init(&ctx);
33+
MD4Update(&ctx, entropy, __arraycount(entropy));
34+
char *p = MD4End(&ctx, digest);
35+
assert(p == digest);
36+
37+
printf("test2: '%s'\n", digest);
38+
}
39+
40+
void test3() {
41+
MD4_CTX ctx;
42+
uint8_t entropy[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
43+
44+
MD4Init(&ctx);
45+
MD4Update(&ctx, entropy, __arraycount(entropy));
46+
char *p = MD4End(&ctx, NULL);
47+
assert(strlen(p) == MD4_DIGEST_STRING_LENGTH - 1);
48+
49+
printf("test3: '%s'\n", p);
50+
51+
free(p);
52+
}
53+
54+
void test4() {
55+
char digest[MD4_DIGEST_STRING_LENGTH];
56+
57+
char *p = MD4File("/etc/fstab", digest);
58+
assert(p == digest);
59+
60+
printf("test4: '%s'\n", p);
61+
}
62+
63+
void test5() {
64+
char *p = MD4File("/etc/fstab", NULL);
65+
assert(strlen(p) == MD4_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[MD4_DIGEST_STRING_LENGTH];
75+
76+
char *p = MD4Data(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 = MD4Data(entropy, __arraycount(entropy), NULL);
86+
assert(strlen(p) == MD4_DIGEST_STRING_LENGTH - 1);
87+
88+
printf("test7: '%s'\n", p);
89+
90+
free(p);
91+
}
92+
93+
int main(void) {
94+
printf("MD4\n");
95+
96+
test1();
97+
test2();
98+
test3();
99+
test4();
100+
test5();
101+
test6();
102+
test7();
103+
104+
// CHECK: MD4
105+
// CHECK: test1: 'bf78fda2ca35eb7a026bfcdd3d17283d'
106+
// CHECK: test2: 'bf78fda2ca35eb7a026bfcdd3d17283d'
107+
// CHECK: test3: 'bf78fda2ca35eb7a026bfcdd3d17283d'
108+
// CHECK: test4: '85b3d78ce68be51f710272728fe606af'
109+
// CHECK: test5: '85b3d78ce68be51f710272728fe606af'
110+
// CHECK: test6: '{{.*}}'
111+
// CHECK: test7: '{{.*}}'
112+
113+
return 0;
114+
}

0 commit comments

Comments
 (0)