Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1e700f5c 1e700f5c5c378762384c2178f98158b399a44b92 by Alain Magloire
Options

GNU md5.c is GPL, so we should use a non GPL version for libmailbox

1 parent 53047de9
Inline Side-by-side
Showing 8 changed files with 437 additions and 17 deletions
...@@ -81,7 +81,8 @@ AC_FUNC_FNMATCH ...@@ -81,7 +81,8 @@ AC_FUNC_FNMATCH
81 if test "$ac_cv_func_fnmatch_works" = "no"; then 81 if test "$ac_cv_func_fnmatch_works" = "no"; then
82 : LIBOBJS="$LIBOBJS fnmatch.o" 82 : LIBOBJS="$LIBOBJS fnmatch.o"
83 fi 83 fi
84 AC_REPLACE_FUNCS(setenv snprintf strtok_r strncasecmp strcasecmp vasprintf) 84 AC_REPLACE_FUNCS(setenv snprintf strtok_r strncasecmp strcasecmp strsignal \
85 vasprintf)
85 AC_CHECK_FUNCS(mkstemp sigaction sysconf) 86 AC_CHECK_FUNCS(mkstemp sigaction sysconf)
86 87
87 dnl Check for libraries 88 dnl Check for libraries
......
...@@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS = ansi2knr ...@@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS = ansi2knr
2 noinst_LIBRARIES = libmailutils.a 2 noinst_LIBRARIES = libmailutils.a
3 3
4 libmailutils_a_SOURCES = basename.c getopt.c getopt1.c md5.c getline.c \ 4 libmailutils_a_SOURCES = basename.c getopt.c getopt1.c md5.c getline.c \
5 xstrdup.c xmalloc.c argcv.c signame.c 5 xstrdup.c xmalloc.c argcv.c
6 6
7 EXTRA_DIST = alloca.c fnmatch.c setenv.c snprintf.c strchrnul.c strndup.c \ 7 EXTRA_DIST = alloca.c fnmatch.c setenv.c snprintf.c strchrnul.c strndup.c \
8 strnlen.c strtok_r.c xstrtol.c vasprintf.c 8 strnlen.c strtok_r.c strsignal.c xstrtol.c vasprintf.c
9 9
10 noinst_HEADERS = argcv.h error.h fnmatch.h getline.h getopt.h md5.h \ 10 noinst_HEADERS = argcv.h error.h fnmatch.h getline.h getopt.h md5.h \
11 snprintf.h xalloc.h xstrtol.h 11 snprintf.h xalloc.h xstrtol.h
......
...@@ -15,21 +15,39 @@ ...@@ -15,21 +15,39 @@
15 along with this program; if not, write to the Free Software 15 along with this program; if not, write to the Free Software
16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
17 17
18
19 #if HAVE_CONFIG_H 18 #if HAVE_CONFIG_H
20 # include <config.h> 19 # include <config.h>
21 #endif 20 #endif
22 #include <signal.h>
23 #include <unistd.h> 21 #include <unistd.h>
22 #include <signal.h>
23 #ifndef SYS_SIGLIST_DECLARED
24 /* For snprintf (). */
25 #include <stdio.h>
26 #endif
27
28 /* Some systems do not define NSIG in <signal.h>. */
29 #ifndef NSIG
30 # ifdef _NSIG
31 # define NSIG _NSIG
32 # else
33 # define NSIG 32
34 # endif
35 #endif
36
37 /* FIXME: Should probably go in a .h somewhere. */
38 char *strsignal __P ((int));
24 39
25 char * 40 char *
26 mu_signame (int signo) 41 strsignal (int signo)
27 { 42 {
28 #ifdef SYS_SIGLIST_DECLARED 43 #ifdef SYS_SIGLIST_DECLARED
29 return sys_siglist[signo]; 44 /* Let's try to protect ourself a little. */
45 if (signo > 0 || signo < NSIG)
46 return (char *)sys_siglist[signo];
47 return (char *)"";
30 #else 48 #else
31 static char buf[64]; 49 static char buf[64];
32 snprintf (buf, sizeof buf, "%d", signo); 50 snprintf (buf, sizeof buf, "Signal %d", signo);
33 return buf; 51 return buf;
34 #endif 52 #endif
35 } 53 }
......
...@@ -9,7 +9,7 @@ SUBDIRS = include ...@@ -9,7 +9,7 @@ SUBDIRS = include
9 9
10 lib_LTLIBRARIES = libmailbox.la 10 lib_LTLIBRARIES = libmailbox.la
11 11
12 EXTRA_DIST = mbx_mboxscan.c 12 EXTRA_DIST = mbx_mboxscan.c md5-rsa.h
13 13
14 libmailbox_la_SOURCES = \ 14 libmailbox_la_SOURCES = \
15 address.c \ 15 address.c \
...@@ -39,6 +39,7 @@ mbx_file.c \ ...@@ -39,6 +39,7 @@ mbx_file.c \
39 mbx_imap.c \ 39 mbx_imap.c \
40 mbx_mbox.c \ 40 mbx_mbox.c \
41 mbx_pop.c \ 41 mbx_pop.c \
42 md5-rsa.c \
42 message.c \ 43 message.c \
43 memory_stream.c \ 44 memory_stream.c \
44 mime.c \ 45 mime.c \
......
1 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
2 */
3
4 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
5 rights reserved.
6
7 License to copy and use this software is granted provided that it
8 is identified as the "RSA Data Security, Inc. MD5 Message-Digest
9 Algorithm" in all material mentioning or referencing this software
10 or this function.
11
12 License is also granted to make and use derivative works provided
13 that such works are identified as "derived from the RSA Data
14 Security, Inc. MD5 Message-Digest Algorithm" in all material
15 mentioning or referencing the derived work.
16
17 RSA Data Security, Inc. makes no representations concerning either
18 the merchantability of this software or the suitability of this
19 software for any particular purpose. It is provided "as is"
20 without express or implied warranty of any kind.
21
22 These notices must be retained in any copies of any part of this
23 documentation and/or software.
24 */
25
26 #include "md5-rsa.h"
27
28 /* Constants for MD5Transform routine.
29 */
30
31 #define S11 7
32 #define S12 12
33 #define S13 17
34 #define S14 22
35 #define S21 5
36 #define S22 9
37 #define S23 14
38 #define S24 20
39 #define S31 4
40 #define S32 11
41 #define S33 16
42 #define S34 23
43 #define S41 6
44 #define S42 10
45 #define S43 15
46 #define S44 21
47
48 static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
49 static void Encode PROTO_LIST
50 ((unsigned char *, UINT4 *, unsigned int));
51 static void Decode PROTO_LIST
52 ((UINT4 *, unsigned char *, unsigned int));
53 static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
54 static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
55
56 static unsigned char PADDING[64] = {
57 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
58 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
59 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
60 };
61
62 /* F, G, H and I are basic MD5 functions.
63 */
64 #define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
65 #define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
66 #define H(x, y, z) ((x) ^ (y) ^ (z))
67 #define I(x, y, z) ((y) ^ ((x) | (~z)))
68
69 /* ROTATE_LEFT rotates x left n bits.
70 */
71 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
72
73 /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
74 Rotation is separate from addition to prevent recomputation.
75 */
76 #define FF(a, b, c, d, x, s, ac) { \
77 (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
78 (a) = ROTATE_LEFT ((a), (s)); \
79 (a) += (b); \
80 }
81 #define GG(a, b, c, d, x, s, ac) { \
82 (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
83 (a) = ROTATE_LEFT ((a), (s)); \
84 (a) += (b); \
85 }
86 #define HH(a, b, c, d, x, s, ac) { \
87 (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
88 (a) = ROTATE_LEFT ((a), (s)); \
89 (a) += (b); \
90 }
91 #define II(a, b, c, d, x, s, ac) { \
92 (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
93 (a) = ROTATE_LEFT ((a), (s)); \
94 (a) += (b); \
95 }
96
97 /* MD5 initialization. Begins an MD5 operation, writing a new context.
98 */
99 void MD5Init (context)
100 MD5_CTX *context; /* context */
101 {
102 context->count[0] = context->count[1] = 0;
103 /* Load magic initialization constants.
104 */
105 context->state[0] = 0x67452301;
106 context->state[1] = 0xefcdab89;
107 context->state[2] = 0x98badcfe;
108 context->state[3] = 0x10325476;
109 }
110
111 /* MD5 block update operation. Continues an MD5 message-digest
112 operation, processing another message block, and updating the
113 context.
114 */
115 void MD5Update (context, input, inputLen)
116 MD5_CTX *context; /* context */
117 unsigned char *input; /* input block */
118 unsigned int inputLen; /* length of input block */
119 {
120 unsigned int i, index, partLen;
121
122 /* Compute number of bytes mod 64 */
123 index = (unsigned int)((context->count[0] >> 3) & 0x3F);
124
125 /* Update number of bits */
126 if ((context->count[0] += ((UINT4)inputLen << 3))
127 < ((UINT4)inputLen << 3))
128 context->count[1]++;
129 context->count[1] += ((UINT4)inputLen >> 29);
130
131 partLen = 64 - index;
132
133 /* Transform as many times as possible.
134 */
135 if (inputLen >= partLen) {
136 MD5_memcpy
137 ((POINTER)&context->buffer[index], (POINTER)input, partLen);
138 MD5Transform (context->state, context->buffer);
139
140 for (i = partLen; i + 63 < inputLen; i += 64)
141 MD5Transform (context->state, &input[i]);
142
143 index = 0;
144 }
145 else
146 i = 0;
147
148 /* Buffer remaining input */
149 MD5_memcpy
150 ((POINTER)&context->buffer[index], (POINTER)&input[i],
151 inputLen-i);
152 }
153
154 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
155 the message digest and zeroizing the context.
156 */
157 void MD5Final (digest, context)
158 unsigned char digest[16]; /* message digest */
159 MD5_CTX *context; /* context */
160 {
161 unsigned char bits[8];
162 unsigned int index, padLen;
163
164 /* Save number of bits */
165 Encode (bits, context->count, 8);
166
167 /* Pad out to 56 mod 64.
168 */
169 index = (unsigned int)((context->count[0] >> 3) & 0x3f);
170 padLen = (index < 56) ? (56 - index) : (120 - index);
171 MD5Update (context, PADDING, padLen);
172
173 /* Append length (before padding) */
174 MD5Update (context, bits, 8);
175
176 /* Store state in digest */
177 Encode (digest, context->state, 16);
178
179 /* Zeroize sensitive information.
180 */
181 MD5_memset ((POINTER)context, 0, sizeof (*context));
182 }
183
184 /* MD5 basic transformation. Transforms state based on block.
185 */
186 static void MD5Transform (state, block)
187 UINT4 state[4];
188 unsigned char block[64];
189 {
190 UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
191
192 Decode (x, block, 64);
193
194 /* Round 1 */
195 FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
196 FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
197 FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
198 FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
199 FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
200 FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
201 FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
202 FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
203 FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
204 FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
205 FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
206 FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
207 FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
208 FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
209 FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
210 FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
211
212 /* Round 2 */
213 GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
214 GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
215 GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
216 GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
217 GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
218 GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
219 GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
220 GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
221 GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
222 GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
223 GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
224 GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
225 GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
226 GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
227 GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
228 GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
229
230 /* Round 3 */
231 HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
232 HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
233 HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
234 HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
235 HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
236 HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
237 HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
238 HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
239 HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
240 HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
241 HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
242 HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
243 HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
244 HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
245 HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
246 HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
247
248 /* Round 4 */
249 II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
250 II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
251 II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
252 II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
253 II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
254 II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
255 II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
256 II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
257 II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
258 II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
259 II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
260 II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
261 II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
262 II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
263 II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
264 II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
265
266 state[0] += a;
267 state[1] += b;
268 state[2] += c;
269 state[3] += d;
270
271 /* Zeroize sensitive information.
272 */
273 MD5_memset ((POINTER)x, 0, sizeof (x));
274 }
275
276 /* Encodes input (UINT4) into output (unsigned char). Assumes len is
277 a multiple of 4.
278 */
279 static void Encode (output, input, len)
280 unsigned char *output;
281 UINT4 *input;
282 unsigned int len;
283 {
284 unsigned int i, j;
285
286 for (i = 0, j = 0; j < len; i++, j += 4) {
287 output[j] = (unsigned char)(input[i] & 0xff);
288 output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
289 output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
290 output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
291 }
292 }
293
294 /* Decodes input (unsigned char) into output (UINT4). Assumes len is
295 a multiple of 4.
296 */
297 static void Decode (output, input, len)
298 UINT4 *output;
299 unsigned char *input;
300 unsigned int len;
301 {
302 unsigned int i, j;
303
304 for (i = 0, j = 0; j < len; i++, j += 4)
305 output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
306 (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
307 }
308
309 /* Note: Replace "for loop" with standard memcpy if possible.
310 */
311
312 static void MD5_memcpy (output, input, len)
313 POINTER output;
314 POINTER input;
315 unsigned int len;
316 {
317 unsigned int i;
318
319 for (i = 0; i < len; i++)
320 output[i] = input[i];
321 }
322
323 /* Note: Replace "for loop" with standard memset if possible.
324 */
325 static void MD5_memset (output, value, len)
326 POINTER output;
327 int value;
328 unsigned int len;
329 {
330 unsigned int i;
331
332 for (i = 0; i < len; i++)
333 ((char *)output)[i] = (char)value;
334 }
1 /* MD5.H - header file for MD5C.C
2 */
3
4 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
5 rights reserved.
6
7 License to copy and use this software is granted provided that it
8 is identified as the "RSA Data Security, Inc. MD5 Message-Digest
9 Algorithm" in all material mentioning or referencing this software
10 or this function.
11
12 License is also granted to make and use derivative works provided
13 that such works are identified as "derived from the RSA Data
14 Security, Inc. MD5 Message-Digest Algorithm" in all material
15 mentioning or referencing the derived work.
16
17 RSA Data Security, Inc. makes no representations concerning either
18 the merchantability of this software or the suitability of this
19 software for any particular purpose. It is provided "as is"
20 without express or implied warranty of any kind.
21 These notices must be retained in any copies of any part of this
22 documentation and/or software.
23 */
24
25 /* GLOBAL.H - RSAREF types and constants
26 */
27
28 /* PROTOTYPES should be set to one if and only if the compiler supports
29 function argument prototyping.
30 The following makes PROTOTYPES default to 0 if it has not already
31 been defined with C compiler flags.
32 */
33 #ifndef PROTOTYPES
34 #define PROTOTYPES 0
35 #endif
36
37 /* POINTER defines a generic pointer type */
38 typedef unsigned char *POINTER;
39
40 /* UINT2 defines a two byte word */
41 typedef unsigned short int UINT2;
42
43 /* UINT4 defines a four byte word */
44 typedef unsigned long int UINT4;
45
46 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
47 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
48 returns an empty list.
49 */
50 #if __STDC__
51 #define PROTO_LIST(list) list
52 #else
53 #define PROTO_LIST(list) ()
54 #endif
55
56 /* MD5 context. */
57 typedef struct {
58 UINT4 state[4]; /* state (ABCD) */
59 UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
60 unsigned char buffer[64]; /* input buffer */
61 } MD5_CTX;
62
63 void MD5Init PROTO_LIST ((MD5_CTX *));
64 void MD5Update PROTO_LIST ((MD5_CTX *, unsigned char *, unsigned int));
65 void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
66
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 #include <string.h> 28 #include <string.h>
29 #include <ctype.h> 29 #include <ctype.h>
30 30
31 #include "md5.h" 31 #include "md5-rsa.h"
32 32
33 #include <message0.h> 33 #include <message0.h>
34 #include <mailutils/address.h> 34 #include <mailutils/address.h>
...@@ -527,7 +527,7 @@ message_get_uidl (message_t msg, char *buffer, size_t buflen, size_t *pwriten) ...@@ -527,7 +527,7 @@ message_get_uidl (message_t msg, char *buffer, size_t buflen, size_t *pwriten)
527 else 527 else
528 { 528 {
529 size_t uid = 0; 529 size_t uid = 0;
530 struct md5_ctx md5context; 530 MD5_CTX md5context;
531 stream_t stream = NULL; 531 stream_t stream = NULL;
532 char buf[1024]; 532 char buf[1024];
533 off_t offset = 0; 533 off_t offset = 0;
...@@ -536,14 +536,14 @@ message_get_uidl (message_t msg, char *buffer, size_t buflen, size_t *pwriten) ...@@ -536,14 +536,14 @@ message_get_uidl (message_t msg, char *buffer, size_t buflen, size_t *pwriten)
536 n = 0; 536 n = 0;
537 message_get_uid (msg, &uid); 537 message_get_uid (msg, &uid);
538 message_get_stream (msg, &stream); 538 message_get_stream (msg, &stream);
539 md5_init_ctx (&md5context); 539 MD5Init (&md5context);
540 while (stream_read (stream, buf, sizeof (buf), offset, &n) == 0 540 while (stream_read (stream, buf, sizeof (buf), offset, &n) == 0
541 && n > 0) 541 && n > 0)
542 { 542 {
543 md5_process_bytes (buf, n, &md5context); 543 MD5Update (&md5context, buf, n);
544 offset += n; 544 offset += n;
545 } 545 }
546 md5_finish_ctx (&md5context, md5digest); 546 MD5Final (md5digest, &md5context);
547 tmp = buf; 547 tmp = buf;
548 for (n = 0; n < 16; n++, tmp += 2) 548 for (n = 0; n < 16; n++, tmp += 2)
549 sprintf (tmp, "%02x", md5digest[n]); 549 sprintf (tmp, "%02x", md5digest[n]);
......
...@@ -38,9 +38,9 @@ pop3d_sigchld (int signo) ...@@ -38,9 +38,9 @@ pop3d_sigchld (int signo)
38 RETSIGTYPE 38 RETSIGTYPE
39 pop3d_signal (int signo) 39 pop3d_signal (int signo)
40 { 40 {
41 extern char *mu_signame __P((int signo)); 41 /* extern char *mu_signame __P((int)); */
42 42
43 syslog (LOG_CRIT, "got signal %s", mu_signame(signo)); 43 syslog (LOG_CRIT, "got signal %s", strsignal(signo));
44 /* Master process. */ 44 /* Master process. */
45 if (!ofile) 45 if (!ofile)
46 { 46 {
......