1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- ed2k.c.orig Sun Jun 13 19:47:20 2004
+++ ed2k.c Sat Oct 7 20:04:07 2006
@@ -32,7 +32,7 @@
#include <sys/stat.h>
/* #define OFF_CONV "%ld" /* off_t is long (Linux) */
-/* #define OFF_CONF "%lld" /* off_t is long long (FreeBSD) */
+#define OFF_CONV "%lld" /* off_t is long long (FreeBSD) */
#ifndef OFF_CONV
# warning "You should define OFF_CONV (see the file)"
@@ -47,16 +47,27 @@
typedef unsigned char md4_t[16];
+#if defined(WITH_RSA)
+
typedef struct {
- u_int32_t state[4];
- u_int32_t count[2];
- unsigned char buffer[64];
+ u_int32_t state[4];
+ u_int32_t count[2];
+ unsigned char buffer[64];
} md4_ctx_t;
void md4_init(md4_ctx_t *);
void md4_update(md4_ctx_t *, unsigned char *, unsigned int);
void md4_finish(md4_ctx_t *, md4_t);
+#else
+
+#include <md4.h>
+#define md4_ctx_t MD4_CTX
+#define md4_init MD4Init
+#define md4_update MD4Update
+#define md4_finish(a,b) MD4Final(b,a)
+
+#endif
static char *progname;
@@ -86,7 +97,7 @@
}
-static __inline__ char hdigit(q) {
+static __inline__ char hdigit(unsigned char q) {
return ((q >= 10) ? 'W' : '0') + q;
}
@@ -95,7 +106,7 @@
char *str = internal_str;
int dsize = sizeof(md4_t);
while (dsize--) {
- unsigned char d = *((unsigned char *)digest)++;
+ unsigned char d = (*((unsigned char *)digest))++;
*(str++) = hdigit(d >> 4 );
*(str++) = hdigit(d & 0xf);
}
@@ -181,6 +192,7 @@
}
+#if defined(WITH_RSA)
/*==> RSA Data Security, Inc. MD4 Message-Digest Algorithm =============*/
@@ -323,3 +335,5 @@
md4_update (context, bits, 8);
md4_encode (digest, context->state, 16);
}
+
+#endif
|
