diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
| commit | 0fa0c9fb7d6f4ad7a423044f28b55eaaedc63f28 (patch) | |
| tree | 98d6947cd8474ab98b57494ebef50e97659be043 /lib/libcrypto/md5 | |
| parent | ecc645c71513728e7357c84aa8997b4dc2301936 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/md5')
| -rw-r--r-- | lib/libcrypto/md5/md5_one.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/md5/md5_one.c b/lib/libcrypto/md5/md5_one.c index c5dd2d81db4..44c6c455d12 100644 --- a/lib/libcrypto/md5/md5_one.c +++ b/lib/libcrypto/md5/md5_one.c @@ -71,7 +71,8 @@ unsigned char *MD5(const unsigned char *d, unsigned long n, unsigned char *md) static unsigned char m[MD5_DIGEST_LENGTH]; if (md == NULL) md=m; - MD5_Init(&c); + if (!MD5_Init(&c)) + return NULL; #ifndef CHARSET_EBCDIC MD5_Update(&c,d,n); #else |